Merge pull request #39 from ARGOeu/devel

Version 0.4.0-1
ARGOeu · Jun 8, 2017 · d928104 · d928104
2 parents 4c7e0ed + 3abb30e
commit d928104
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 2 deletions.
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.4
+Version: 0.4.0
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Network/Monitoring

diff --git a/config/ncg-metric-config.d/aai.conf b/config/ncg-metric-config.d/aai.conf
@@ -0,0 +1,142 @@
+{
+   "org.nagios.SAML-SP" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/proxy/module.php/saml/sp/metadata.php/sso"
+      },
+      "probe" : "check_http"
+   },
+   "org.nagios.SAML-IdP" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/proxy/saml2/idp/metadata.php"
+      },
+      "probe" : "check_http"
+   },
+   "org.nagios.IdP-DiscoveryService" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/proxy/module.php/core/authenticate.php?as=sso"
+      },
+      "probe" : "check_http"
+   },
+   "org.nagios.OIDC-Provider-Config" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/oidc/.well-known/openid-configuration"
+      },
+      "probe" : "check_http"
+   },
+   "org.nagios.OIDC-AuthZ" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/oidc/authorize"
+      },
+      "probe" : "check_http"
+   },
+   "org.nagios.TTS-MasterPortal-Config" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/mp-oa2-server/.well-known/configuration"
+      },
+      "probe" : "check_http"
+   },
+   "org.nagios.TTS-MasterPortal-Register" : {
+      "config" : {
+         "interval" : 5,
+         "maxCheckAttempts" : 3,
+         "path" : "$USER1$",
+         "retryInterval" : 3,
+         "timeout" : 60
+      },
+      "docurl" : "http://nagios-plugins.org/doc/man/check_http.html",
+      "flags" : {
+         "OBSESS" : 1,
+         "PNP" : 1
+      },
+      "parameter" : {
+         "--link" : 0,
+         "--ssl" : 0,
+         "-u" : "/mp-oa2-server/register"
+      },
+      "probe" : "check_http"
+   }   
+}
diff --git a/config/ncg-metric-config.d/argus.conf b/config/ncg-metric-config.d/argus.conf
@@ -0,0 +1,25 @@
+{
+   "eu.egi.Argus-DNs" : {
+      "config" : {
+         "interval" : 180,
+         "maxCheckAttempts" : 3,
+         "path" : "/usr/libexec/argo-monitoring/probes/eu.egi/",
+         "retryInterval" : 30,
+         "timeout" : 60
+      },
+      "docurl" : "https://sccsec-egi-git.scc.kit.edu/EGI-CSIRT/nagios-plugins-egi.argus-ngi",
+      "flags" : {
+         "OBSESS" : 1
+      },
+      "parameter" : {
+         "-v" : " -v",
+         "--today" : 0
+      },
+      "attribute" : {
+         "ARGUS_SALT" : "--salt",
+         "NAGIOS_HOST_CERT" : "--cert",
+         "NAGIOS_HOST_KEY" : "--key"
+      },
+      "probe" : "argus-check.py"
+   }
+}
diff --git a/src/modules/NCG/LocalMetricsAttrs/Active.pm b/src/modules/NCG/LocalMetricsAttrs/Active.pm
@@ -349,6 +349,11 @@ sub _analyzeURLs {
             $self->{SITEDB}->hostAttribute($hostname, "GSISSH_PORT", $3);
         }
     }
+    if ($attr = $self->{SITEDB}->hostAttribute($hostname, "FTS_URL")) {
+        if ($attr =~ /(\S+?:\/\/)?([-_.A-Za-z0-9]+):(\d+)/ ) {
+            $self->{SITEDB}->hostAttribute($hostname, "FTS_PORT", $3);
+        }
+    }
 
     my @unicoreServices = ("unicore6.Gateway", "unicore6.ServiceOrchestrator", "unicore6.StorageManagement", "unicore6.TargetSystemFactory", "unicore6.UVOSAssertionQueryService", "unicore6.WorkflowFactory", "unicore6.StorageFactory");
     foreach my $unicoreService (@unicoreServices) {
@@ -439,7 +444,7 @@ sub _setDefaultPorts {
 	$self->{SITEDB}->globalAttribute("SRM1_PORT", 8443);
 	$self->{SITEDB}->globalAttribute("SRM2_PORT", 8446);
 	$self->{SITEDB}->globalAttribute("GSISSH_PORT", 1975);
-	$self->{SITEDB}->globalAttribute("FTS_PORT", 8443);
+	$self->{SITEDB}->globalAttribute("FTS_PORT", 8446);
 	$self->{SITEDB}->globalAttribute("GRIDICE_PORT", 2136);
 	$self->{SITEDB}->globalAttribute("CREAM_PORT", 8443);
     $self->{SITEDB}->globalAttribute("QCG-COMPUTING_PORT", 19000);