From cab6bf94541615d8ca01717c57d39c9c4fe1a839 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 2 Nov 2023 12:53:21 +0100 Subject: [PATCH 1/2] ARGO-4420 - endpoint Url for webdav and xrootd metric --- src/modules/NCG/LocalMetricsAttrs/Active.pm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/modules/NCG/LocalMetricsAttrs/Active.pm b/src/modules/NCG/LocalMetricsAttrs/Active.pm index be4f213..aa1b031 100644 --- 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 { From 9ba4344d61ac3b76163a3a7e0848ddbdf258bb0d Mon Sep 17 00:00:00 2001 From: eimamagi Date: Mon, 6 Nov 2023 10:44:42 +0100 Subject: [PATCH 2/2] Version bump. --- argo-ncg.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/argo-ncg.spec b/argo-ncg.spec index 91e256e..090f7df 100644 --- 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 - 0.4.17-1 +- Version bump * Mon Oct 03 2022 Emir Imamagic - 0.4.15-1 - Version bump * Thu Sep 01 2022 Emir Imamagic - 0.4.14-1