Fixed configuration bug

nagios/config/cms_param_override

-MODIFY_METRIC_PARAMETER!org.sam.CONDOR-JobMonit!--timeout-job-idle!82800
-MODIFY_METRIC_PARAMETER!org.sam.CONDOR-JobMonit!--timeout-job-running!82800
-MODIFY_METRIC_PARAMETER!org.sam.CONDOR-JobMonit!--timeout-job-held!82800
-MODIFY_METRIC_PARAMETER!org.sam.CONDOR-JobMonit!--timeout-job-discard!84600
-
-ADD_SERVICE_METRIC!NAGIOS!org.sam.CONDOR-JobMonit
-
-VO_ATTRIBUTE!/cms/Role=pilot!CONDOR-JOBSUBMIT-PARAMETERS!/usr/libexec/grid-monitoring/probes/org.cms/wnjob/org.cms.glexec
-VO_ATTRIBUTE!/cms/Role=lcgadmin!CONDOR-JOBSUBMIT-PARAMETERS!/usr/libexec/grid-monitoring/probes/org.cms/wnjob/org.cms,/usr/libexec/grid-monitoring/probes/org.cms/wnjob/org.cms.lcgadmin
-VO_ATTRIBUTE!/cms/Role=production!CONDOR-JOBSUBMIT-PARAMETERS!/usr/libexec/grid-monitoring/probes/org.cms/wnjob/org.cms,/usr/libexec/grid-monitoring/probes/org.cms/wnjob/org.cms.production

nagios/config/etf_plugin_cms.py

@@ -17,20 +17,17 @@ FLAVOR_MAP = {'CREAM-CE': 'cream',
 
 CE_STATE_METRICS = (
 'org.sam.CONDOR-JobState-/cms/Role=lcgadmin',
-'org.sam.CONDOR-JobState-/cms/Role=pilot',
-'org.sam.CONDOR-JobState-/cms/Role=production',)
+'org.sam.CONDOR-JobState-/cms/Role=pilot')
 
 CE_METRICS = (
 'org.sam.CONDOR-JobSubmit-/cms/Role=lcgadmin',
 'org.sam.CONDOR-JobSubmit-/cms/Role=pilot',
-'org.sam.CONDOR-JobSubmit-/cms/Role=production',
 'org.cms.WN-analysis-/cms/Role=lcgadmin',
 'org.cms.WN-isolation-/cms/Role=pilot',
 'org.cms.WN-basic-/cms/Role=lcgadmin',
 'org.cms.WN-cvmfs-/cms/Role=lcgadmin',
 'org.cms.WN-env-/cms/Role=lcgadmin',
 'org.cms.WN-frontier-/cms/Role=lcgadmin',
-'org.cms.WN-mc-/cms/Role=production',
 'org.cms.WN-mc-/cms/Role=lcgadmin',
 'org.cms.WN-remotestageout-/cms/Role=lcgadmin',
 'org.cms.WN-squid-/cms/Role=lcgadmin',

nagios/config/org.cms.lcgadmin/etc/wn.d/org.cms/services.cfg

@@ -99,3 +99,8 @@ define service {
         service_description     org.cms.WN-singularity-<VOMS>
         check_command           samtest-run-sensor!CE-cms-singularity
         }
+define service {
+        use                     sam-generic-wn-active
+        service_description     org.cms.WN-mc-<VOMS>
+        check_command           samtest-run-sensor!CE-cms-mc
+        }

nagios/grid-monitoring-probes-org.cms-etf.spec

@@ -4,7 +4,7 @@
 
 Summary: WLCG Compliant Probes from %{site}
 Name: nagios-plugins-wlcg-org.cms
-Version: 1.1.45
+Version: 1.1.46
 Release: 1%{?dist}
 
 License: GPL
@@ -49,6 +49,8 @@ install --directory %{buildroot}/etc/cron.d
 /etc/cron.d/cms_glexec
 
 %changelog
+* Mon Oct 30 2017 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.46-1.
+- Fixed a configuration bug for the mc test
 * Tue Oct 17 2017 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.45-1.
 - added submission of mc test with lcgadmin role
 - added IPv6 DNS test