Merge pull request #35 from ARGOeu/devel

Version 0.3.4
ARGOeu · May 25, 2017 · 4c7e0ed · 4c7e0ed
2 parents 5d70355 + b182c8c
commit 4c7e0ed
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/argo-ncg.spec b/argo-ncg.spec
@@ -5,7 +5,7 @@
 
 Summary: ARGO Nagios config generator
 Name: argo-ncg
-Version: 0.3.3
+Version: 0.3.4
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Network/Monitoring
@@ -105,6 +105,8 @@ if [ -f /etc/init.d/ncg ] ; then
 fi
 
 %changelog
+* Thu May 25 2017 Emir Imamagic <[email protected]> - 0.3.4-1
+- Version bump
 * Thu May 4 2017 Emir Imamagic <[email protected]> - 0.3.3-1
 - Version bump
 * Thu Apr 6 2017 Emir Imamagic <[email protected]> - 0.3.2-1

diff --git a/config/ncg-metric-config.d/midmon.conf b/config/ncg-metric-config.d/midmon.conf
@@ -46,6 +46,30 @@
       },
       "probe" : "midmon/check_bdii_entries_num"
    },
+   "eu.egi.sec.dCache-2.13" : {
+      "attribute" : {
+         "SITE_BDII" : "-H",
+         "BDII_PORT" : "-p"
+      },
+      "parameter" : {
+         "-w" : "0:0",
+         "-f" : "\"(&(GlueSEImplementationName=dCache)(GlueSEImplementationVersion=2.13.*)(GlueSEUniqueID=*$HOSTNAME$*))\"",
+         "-b" : "O=grid"
+      },
+      "flags" : {
+         "NOHOSTNAME" : 1,
+         "OBSESS" :1
+      },
+      "docurl" : "https://wiki.egi.eu/wiki/MW_Nagios_tests",
+      "config" : {
+         "maxCheckAttempts" : 1,
+         "timeout" : 120,
+         "path" : "/usr/libexec/argo-monitoring/probes",
+         "retryInterval" : 15,
+         "interval" : 1440
+      },
+      "probe" : "midmon/check_bdii_entries_num"
+   },
    "org.bdii.GLUE2-Validate" : {
       "flags" : {
          "NRPE" : 1,

diff --git a/config/ncg-metric-config.d/webdav.conf b/config/ncg-metric-config.d/webdav.conf
@@ -0,0 +1,23 @@
+{
+   "ch.cern.WebDAV" : {
+      "config" : {
+         "interval" : 60,
+         "maxCheckAttempts" : 2,
+         "path" : "$USER1$",
+         "retryInterval" : 15,
+         "timeout" : 600
+      },
+      "docurl" : "https://gitlab.cern.ch/lcgdm/nagios-plugins-webdav",
+      "flags" : {
+         "OBSESS" : 1
+      },
+      "parameter" : {
+         "-v" : " -v"
+      },
+      "attribute" : {
+         "webdav_URL" : "-u",
+         "X509_USER_PROXY" : "-E"
+      },
+      "probe" : "check_webdav"
+   }
+}