fix for ipv4-only vo feed

Dockerfile_IPv6

@@ -67,7 +67,7 @@ COPY nagios/config/cms_glexec-etf /etc/cron.d/cms_glexec
 # ETF config
 #COPY ./config/service_template.tpl /etc/ncgx/templates/
 COPY docker/etf-cms/config/ncgx_ipv6.cfg /etc/ncgx/ncgx.cfg
-COPY docker/etf-cms/config/cms_checks.cfg /etc/ncgx/conf.d/
+COPY docker/etf-cms/config/cms_checks_v6.cfg /etc/ncgx/conf.d/cms_checks.cfg
 RUN sed -i  "s|/usr/bin/ncgx|/urs/bin/ncgx --ipv6|g" /opt/omd/sites/$CHECK_MK_SITE/etc/cron.d/ncgx
 
 EXPOSE 443 6557

docker/etf-cms/config/cms_checks.cfg

@@ -24,7 +24,7 @@ metrics = {
 }
 
 checks = [
-   [ 'localhost', "CMS VO feed", {"extends": "check_http", "args" : {"-u" : "/cmssst/vofeed/dev/vofeed.xml", "-H" : "cmssst.web.cern.ch", "-t" : 60, "-s" : '"CMS Topology Information"', "--onredirect" : "follow"}} ],
+   [ 'localhost', "CMS VO feed", {"extends": "check_http", "args" : {"-u" : "/dashboard/request.py/cmssitemapbdii", "-H" : "wlcg-sam-cms.cern.ch", "-t" : 60, "-s" : '"CMS Topology Information"', "--onredirect" : "follow"}} ],
    [ 'localhost', "ETF Livestatus Stats", {"extends": "check_live"} ],
    [ 'localhost', "org.globus.GridProxy-Valid-/cms/Role=production" ],
    [ 'localhost', "org.globus.GridProxy-Valid-cms" ],

docker/etf-cms/config/cms_checks_v6.cfg

+metrics = {
+   "CMS feed diff" : {
+        "ocsp" : 0,
+        "command" : "/usr/lib64/nagios/plugins/check_feed_diff",
+        "args" : {},
+        "interval" : 180,
+        "retry_interval" : 180,
+        "max_check_attempts" : 1,
+        "ocsp" : 0,
+        "nagios_command" : "ncgx_check",
+   },
+   "check_live" : {
+        "command" : "/usr/lib64/nagios/plugins/check_live",
+        "args" : {},
+        "interval" : 15,
+        "retry_interval" : 15,
+        "max_check_attempts" : 1,
+        "ocsp" : 0,
+        "nagios_command" : "ncgx_check",
+   },
+   "SAM3 diff" : {
+        "extends" : "check_ardiff",
+   }
+}
+
+checks = [
+   [ 'localhost', "CMS VO feed", {"extends": "check_http", "args" : {"-u" : "/dashboard/request.py/cmssitemapbdii", "-H" : "etf.cern.ch", "-p" : 20000, "-t" : 60, "-s" : '"CMS Topology Information"', "--onredirect" : "follow"}} ],
+   [ 'localhost', "ETF Livestatus Stats", {"extends": "check_live"} ],
+   [ 'localhost', "org.globus.GridProxy-Valid-/cms/Role=production" ],
+   [ 'localhost', "org.globus.GridProxy-Valid-cms" ],
+   [ 'localhost', "SAM3 diff", {"args" : {"--prod-link": "wlcg-sam-cms.cern.ch",
+                                          "--qa-link": "wlcg-sam-cms-dev.cern.ch",
+                                          "--prod-profile": "CMS_CRITICAL",
+                                          "--qa-profile": "CMS_CRITICAL"}} ],
+]
\ No newline at end of file

docker/etf-cms/config/ncgx_ipv6.cfg

 MB_BROKER_HOST="stomp://oldsam.msg.cern.ch:6163/"
 MB_DESTINATION="/queue/grid.probe.metricOutput.EGEE.etf-cms-prod_cern_ch"
 
-PLUGINS = { "etf_plugin_cms" : { "url": "http://wlcg-sam-cms.cern.ch/dashboard/request.py/cmssitemapbdii", "ipv6": True}}
+PLUGINS = { "etf_plugin_cms" : { "url": "http://etf.cern.ch:20000/dashboard/request.py/cmssitemapbdii", "ipv6": True}}
 VO = 'cms'
 #ATTRIBUTE_OVERRIDE = [ ('ALL', {'interval' : 15}), ('ALL', { 'passive': False }), ('ALL', {'retry_interval' : 15}) ]
 #COMMAND_OVERRIDE = { 'ALL' : 'ncgx_check!check_random!-s \"o,w,c,u\"' }