Merge pull request #166 from ARGOeu/devel

Version bump
ARGOeu · Nov 6, 2023 · 3e4ed60 · 3e4ed60
2 parents 5ef3a6a + 9ba4344
commit 3e4ed60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 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.4.17
+Version: 0.4.18
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Network/Monitoring
@@ -96,6 +96,8 @@ if [ -f /etc/init.d/ncg ] ; then
 fi
 
 %changelog
+* Mon Nov 06 2023 Emir Imamagic <[email protected]> - 0.4.17-1
+- Version bump
 * Mon Oct 03 2022 Emir Imamagic <[email protected]> - 0.4.15-1
 - Version bump
 * Thu Sep 01 2022 Emir Imamagic <[email protected]> - 0.4.14-1

diff --git a/src/modules/NCG/LocalMetricsAttrs/Active.pm b/src/modules/NCG/LocalMetricsAttrs/Active.pm
@@ -382,21 +382,6 @@ sub _analyzeURLs {
         $self->{SITEDB}->hostAttribute($hostname, 'BROKER_PORT', $cdmiurl->port);};
     }
 
-    if ($self->{SITEDB}->hasService($hostname, "webdav")) {
-        unless ($self->{SITEDB}->hostAttribute($hostname, "ARGO_WEBDAV_OPS_URL")) {
-            $self->{SITEDB}->hostAttribute($hostname, "ARGO_WEBDAV_OPS_URL", $self->{SITEDB}->hostAttribute($hostname, 'webdav_URL')); 
-        }
-    }
-    if ($self->{SITEDB}->hasService($hostname, "XRootD")) {
-        unless ($self->{SITEDB}->hostAttribute($hostname, "ARGO_XROOTD_OPS_URL")) {
-            if ( $attr = $self->{SITEDB}->hostAttribute($hostname, "XROOTD_URL") ) {
-                $self->{SITEDB}->hostAttribute($hostname, "ARGO_XROOTD_OPS_URL", $attr);
-            } else {
-                $self->{SITEDB}->hostAttribute($hostname, "ARGO_XROOTD_OPS_URL", $self->{SITEDB}->hostAttribute($hostname, 'XRootD_URL'));
-            }
-        }
-    }
-
 }
 
 sub _setDefaultPorts {