Release 7.0.10 - See CHANGELOG.md

tiredofit · Aug 23, 2023 · 0110710 · 0110710
1 parent 18b4493
commit 0110710
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.0.10 2023-08-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for Zabbix monitoring (No Syncs performed in 2 days)
+
+
 ## 7.0.9 2023-07-10 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/install/assets/functions/50-gcds b/install/assets/functions/50-gcds
@@ -144,7 +144,6 @@ configure_monitoring() {
 
 UserParameter=gcds.version,/gcds/sync-cmd -v | head -n 1 | awk '{print \$2}'
 EOF
-    create_zabbix gcds
 }
 
 notify() {
@@ -314,7 +313,7 @@ post_sync() {
         silent s6-setuidgid "${ZABBIX_USER}" zabbix_sender \
                             -c "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}" \
                             -k gcds.last_sync \
-                            -o "${log_unixtime}"
+                            -o "${log_unixdate}"
         silent zabbix_sender \
                             -c "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}" \
                             -k gcds.sync_status \

diff --git a/zabbix_templates/gcds.json b/zabbix_templates/gcds.json
@@ -1,7 +1,6 @@
 {
     "zabbix_export": {
-        "version": "6.2",
-        "date": "2023-01-28T21:45:24Z",
+        "version": "6.4",
         "template_groups": [
             {
                 "uuid": "a571c0d144b14fd4a87a9d9b2aa9fcd6",
@@ -25,6 +24,12 @@
                         "name": "GCDS: Last Sync Time",
                         "key": "gcds.last_sync",
                         "history": "7d",
+                        "tags": [
+                            {
+                                "tag": "Application",
+                                "value": "Google Cloud Directory Sync"
+                            }
+                        ],
                         "triggers": [
                             {
                                 "uuid": "62e511e66b6545dd933d921bd4088168",
@@ -43,11 +48,17 @@
                         "delay": "0",
                         "history": "7d",
                         "description": "How long the sync took",
+                        "tags": [
+                            {
+                                "tag": "Application",
+                                "value": "Google Cloud Directory Sync"
+                            }
+                        ],
                         "triggers": [
                             {
                                 "uuid": "4989397e34a847b2aca79bd34688005e",
-                                "expression": "last(/GCDS/gcds.sync_duration)<10",
-                                "name": "GCDS: Last Sync duration under 10 seconds",
+                                "expression": "last(/GCDS/gcds.sync_duration)<3",
+                                "name": "GCDS: Last Sync duration under 3 seconds",
                                 "priority": "AVERAGE",
                                 "manual_close": "YES"
                             }
@@ -64,6 +75,12 @@
                         "valuemap": {
                             "name": "Sync Status"
                         },
+                        "tags": [
+                            {
+                                "tag": "Application",
+                                "value": "Google Cloud Directory Sync"
+                            }
+                        ],
                         "triggers": [
                             {
                                 "uuid": "78ba5ff8d88946e5abb51ebf1a77cc18",
@@ -78,6 +95,9 @@
                         "uuid": "dc0318c0e31f43f69be713e85f1b5d15",
                         "name": "GCDS: Version",
                         "key": "gcds.version",
+                        "trends": "0",
+                        "status": "DISABLED",
+                        "value_type": "TEXT",
                         "tags": [
                             {
                                 "tag": "Application",