diff --git a/templates/sematext/0/docker-compose.yml b/templates/sematext/0/docker-compose.yml
index fb3a6b7..c4c2d80 100755
--- a/templates/sematext/0/docker-compose.yml
+++ b/templates/sematext/0/docker-compose.yml
@@ -1,8 +1,17 @@
sematext-agent:
- image: 'sematext/sematext-agent-docker:latest'
+ image: 'sematext/sematext-agent-docker:${image_version}'
environment:
- LOGSENE_TOKEN=${logsene_token}
- SPM_TOKEN=${spm_token}
+ - GEOIP_ENABLED=${geoip_enabled}
+ - HTTPS_PROXY=${https_proxy}
+ - HTTP_PROXY=${http_proxy}
+ - MATCH_BY_IMAGE=${match_by_image}
+ - MATCH_BY_NAME=${match_by_name}
+ - SKIP_BY_IMAGE=${match_by_image}
+ - SKIP_BY_NAME=${match_by_name}
+ - LOGAGENT_PATTERNS=${logagent_patterns}
+ - KUBERNETES=${kubernetes}
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock
diff --git a/templates/sematext/0/rancher-compose.yml b/templates/sematext/0/rancher-compose.yml
index 8ff1738..d1a9630 100755
--- a/templates/sematext/0/rancher-compose.yml
+++ b/templates/sematext/0/rancher-compose.yml
@@ -4,6 +4,12 @@
description: "Sematext Docker Agent"
minimum_rancher_version: v0.46.0
questions:
+ - variable: "image_version"
+ label: "Image version tag"
+ description: "default 'latest'"
+ default: "latest"
+ required: true
+ type: "string"
- variable: "spm_token"
label: "SPM Token"
description: "Your SPM Application Token"
@@ -14,3 +20,59 @@
description: "Your Logsene Application Token"
required: true
type: "string"
+ - variable: "geoip_enabled"
+ label: "Enable Geo IP"
+ description: "Enable Geo IP lookups and updaes for maxmind geoip-lite database"
+ required: false
+ default: "false"
+ type: "enum"
+ options:
+ - "false"
+ - "true"
+ - variable: "match_by_name"
+ label: "Collect logs only from containers matching the container name."
+ description: "Regular expression, e.g. nginx|mongo"
+ required: false
+ type: "string"
+ - variable: "match_by_image"
+ label: "Collect logs only from containers matching the image name"
+ description: "Regular expression, e.g. nginx|mongo"
+ required: false
+ type: "string"
+ - variable: "skip_by_name"
+ label: "Exclude logs from containers matching the container name"
+ description: "Regular expression, e.g. nginx|mongo"
+ required: false
+ type: "string"
+ - variable: "skip_by_image"
+ label: "Exclude logs from containers matching the image name"
+ description: "Regular expression, e.g. nginx|mongo"
+ required: false
+ type: "string"
+ - variable: "http_proxy"
+ label: "HTTP Proxy"
+ description: "Proxy url, when the agent runs behind a firewall e.g. http://myproxy:9090"
+ required: false
+ type: "string"
+ - variable: "https_proxy"
+ label: "HTTPS Proxy"
+ description: "Secure Proxy url, when the agent runs behind a firewall e.g. https://myproxy:9090"
+ required: false
+ type: "string"
+ - variable: "kubernetes"
+ label: "Tag logs with Kuberntes metadata"
+ description: "Enable/disable tagging of logs with namespace, pod, UID, container name, ..."
+ required: false
+ default: "0"
+ type: "enum"
+ options:
+ - 0
+ - 1
+ - variable: "logagent_patterns"
+ label: "Custom pattern definitions for log parsing."
+ type: "multiline"
+ required: false
+
+
+
+
diff --git a/templates/sematext/README.md b/templates/sematext/README.md
index e41b43b..718e55e 100644
--- a/templates/sematext/README.md
+++ b/templates/sematext/README.md
@@ -1,11 +1,24 @@
-# Sematext Docker Agent
-
-[Sematext Docker Agent](https://github.com/sematext/sematext-agent-docker) collects Metrics, Events and Logs from the Docker API for [SPM Docker Monitoring](http://sematext.com/spm/integrations/docker-monitoring.html) & [Logsene / Hosted ELK](http://sematext.com/logsene) Log Management.
+[Sematext Docker Agent](https://github.com/sematext/sematext-agent-docker) collects Metrics, Events and Logs from the Docker API for [SPM Docker Monitoring](http://sematext.com/spm/integrations/docker-monitoring.html) & [Logsene](http://sematext.com/logsene) Log Management.
-* Sematext Docker Agent will be deployed globally by default so that every host is monitored
+This template deploys Sematext Docker Agent globally to monitor all containers on every RancherOS cluster node.
-# Quickstart - get up and running in 5 minutes
+## Highlights
+- Autodiscovery of containers
+- Detailed host and [container metrics](https://sematext.com/blog/2016/06/28/top-docker-metrics-to-watch/)
+- Tracking of Docker events
+- Tagging of logs with Swarm and Kubernetes metadata
+- Log format detection and parsing
+
+## Quickstart
1. Get a free account [apps.sematext.com](https://apps.sematext.com/users-web/register.do)
2. [Create an SPM App of type “Docker”](https://apps.sematext.com/spm-reports/registerApplication.do) to obtain the SPM Application Token
3. Create a [Logsene](http://www.sematext.com/logsene/) App to obtain the Logsene Token
+4. Customize [Sematext Docker Agent settings](https://github.com/sematext/sematext-agent-docker#configuration-parameters) in the template below
+
+## Support
+1. Please check the [SPM for Docker Wiki](https://sematext.atlassian.net/wiki/display/PUBSPM/SPM+for+Docker)
+2. If you have questions about SPM for Docker, chat with us in the [SPM user interface](https://apps.sematext.com/users-web/login.do) or drop an e-mail to support@sematext.com
+3. Open an issue [here](https://github.com/sematext/sematext-agent-docker/issues)
+4. Contribution guide [here](https://github.com/sematext/sematext-agent-docker/blob/master/contribute.md)
+
diff --git a/templates/sematext/catalogIcon-sematext.svg b/templates/sematext/catalogIcon-sematext.svg
index c20e24c..ffef007 100644
--- a/templates/sematext/catalogIcon-sematext.svg
+++ b/templates/sematext/catalogIcon-sematext.svg
@@ -1,160 +1,115 @@
-
-
+
+
diff --git a/templates/sematext/config.yml b/templates/sematext/config.yml
index 600cb4c..5dee2cc 100755
--- a/templates/sematext/config.yml
+++ b/templates/sematext/config.yml
@@ -1,6 +1,6 @@
name: Sematext Docker Agent
description: |
- Sematext Docker Agent - Performance Monitoring. Collection of Metrics, Events and Logs.
+ Performance Monitoring and Log Management. Collection of Metrics, Events and Logs.
version: 1.29.44
category: Monitoring
maintainer: "Stefan Thies "