README update

monitoringartist · Sep 28, 2017 · 18df491 · 18df491
1 parent c305515
commit 18df491
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile/dockbix-xxl/retag.sh b/Dockerfile/dockbix-xxl/retag.sh
@@ -6,7 +6,7 @@ git fetch --tags --force
 tags=()
 for t in `git tag`
 do
-    if [[ "$t" != 3* ]]; then
+    if [[ "$t" != 3.4* ]]; then
          continue
     fi
     echo "Deleting tag $t"

diff --git a/README.md b/README.md
@@ -10,14 +10,14 @@ If you like or use this project, please provide feedback to the author - Star it
 
 **Overview of Monitoring Artist (dockerized) monitoring ecosystem:**
 
-- **[Dockbix XXL](https://hub.docker.com/r/monitoringartist/dockbix-xxl/)** - standard Zabbix server/proxy/UI/snmpd/java gateway with additional XXL extensions
-- **[Dockbix agent XXL](https://hub.docker.com/r/monitoringartist/dockbix-agent-xxl-limited/)** - Zabbix agent with [Docker (Kubernetes/Mesos/Chronos/Marathon) monitoring](https://github.com/monitoringartist/zabbix-docker-monitoring)
-- **[Zabbix templates](https://hub.docker.com/r/monitoringartist/zabbix-templates/)** - tiny (5MB) image for easy template deployment of selected Zabbix monitoring templates
-- **[Zabbix extension - all templates](https://hub.docker.com/r/monitoringartist/zabbix-ext-all-templates/)** - storage image for Zabbix XXL with 200+ [community templates](https://github.com/monitoringartist/zabbix-community-repos)
+- **[Dockbix XXL](https://hub.docker.com/r/monitoringartist/dockbix-xxl/)** - Zabbix server/proxy/UI/snmpd/java gateway with additional extensions
+- **[Dockbix agent XXL](https://hub.docker.com/r/monitoringartist/dockbix-agent-xxl-limited/)** - Zabbix agent with [Docker (Kubernetes/Mesos/Chronos/Marathon) monitoring](https://github.com/monitoringartist/zabbix-docker-monitoring) module
+- **[Zabbix templates](https://hub.docker.com/r/monitoringartist/zabbix-templates/)** - tiny Docker image for simple template deployment of selected Zabbix monitoring templates
+- **[Zabbix extension - all templates](https://hub.docker.com/r/monitoringartist/zabbix-ext-all-templates/)** - storage image for Dockbix XXL with 200+ [community templates](https://github.com/monitoringartist/zabbix-community-repos)
 - **[Kubernetized Zabbix](https://github.com/monitoringartist/kubernetes-zabbix)** - containerized Zabbix cluster based on Kubernetes
 - **[Grafana XXL](https://hub.docker.com/r/monitoringartist/grafana-xxl/)** - dockerized Grafana with all community plugins
 - **[Grafana dashboards](https://grafana.net/monitoringartist)** - Grafana dashboard collection for [AWS](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards) and [Zabbix](https://github.com/monitoringartist/grafana-zabbix-dashboards)
-- **[Monitoring Analytics](https://hub.docker.com/r/monitoringartist/monitoring-analytics/)** - R statistical computing and graphics for monitoring from data scientists
+- **[Monitoring Analytics](https://hub.docker.com/r/monitoringartist/monitoring-analytics/)** - graphic analytic tool for Zabbix data from data scientists
 - **[Docker killer](https://hub.docker.com/r/monitoringartist/docker-killer/)** - Docker image for Docker stress and Docker orchestration testing
 
 ----
@@ -128,7 +128,7 @@ Available variables related to XXL features:
 | XXL_apiuser | Admin | username used for API commands |
 | XXL_apipass | zabbix | password used for API commands |
 | XXL_analytics | true | enable/disable collecting of statistics via Google Analytics |
-| XXL_updatechecker | true | enable/disable check of the latest available Docker image |
+| XXL_updatechecker | true | enable/disable check of the latest Docker image - checks are executed in the user browser once per day |
 
 Use environment variables to config Zabbix server and Zabbix web UI (PHP). You
 can add any Zabbix config variables, just add correct variable prefix

diff --git a/artifacts/deploy.sh b/artifacts/deploy.sh
@@ -5,11 +5,11 @@ SOURCE_BRANCH="master"
 TARGET_BRANCH="master"
 
 function doCompile {
-  docker rmi monitoringartist/zabbix-xxl:latest || true
-  ZVERSION=$(docker run --rm -ti monitoringartist/zabbix-xxl:latest zabbix_agentd -V | grep ^zabbix_agentd | awk -F'\\(Zabbix\\) ' '{print $2}' | sed -e 's/[[:blank:],[:cntrl:]]$//g;/^$/d')
+  docker rmi monitoringartist/dockbix-xxl:latest || true
+  ZVERSION=$(docker run --rm -ti monitoringartist/dockbix-xxl:latest zabbix_agentd -V | grep ^zabbix_agentd | awk -F'\\(Zabbix\\) ' '{print $2}' | sed -e 's/[[:blank:],[:cntrl:]]$//g;/^$/d')
   echo $ZVERSION
   sed -i "s#.*\"version\":.*#\"version\": \"$ZVERSION\",#" latest
-  sed -i "s#Docker image.*has been released#Docker image $ZVERSION has been released#" latest
+  sed -i "s#Docker image version.*is available#Docker image version $ZVERSION  is available#" latest
 }
 
 # Pull requests and commits to other branches shouldn't try to deploy

diff --git a/latest b/latest
@@ -1,5 +1,5 @@
 {
 "display": 0,
 "version": "3.2.7 (2017-09-14)",
-"text": "<p style=\"font-size:80%\">New latest Docker image 3.2.7 (2017-09-14) has been released. Please ask administrator to pull <b><a href=\"https://hub.docker.com/r/monitoringartist/zabbix-xxl/\" target=\"_blank\">monitoringartist/zabbix-xxl:latest</a></b>.</p>"         
+"text": "<p style=\"font-size:80%\">New Dockbix Docker image version 3.2.7 (2017-09-14) is available!. See <b><a href=\"https://hub.docker.com/r/monitoringartist/dockbix-xxl/\" target=\"_blank\">monitoringartist/dockbix-xxl:latest</a></b>.</p>"
 }