SCTASK0076027 Preparing for version 1.8.2 release

GlobalNOC · Nov 22, 2021 · 1b5e2be · 1b5e2be
1 parent 49159c3
commit 1b5e2be
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,9 @@ dist/*
 /t/conf/*.pid
 /t/redis.[0-9]*
 
+# perltidy
+.perltidyrc
+
 # NYTProf Profiles
 nytpro*
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME=simp
-VERSION=1.8.1
+VERSION=1.8.2
 
 .PHONY: dist
 

diff --git a/lib/GRNOC/Simp/Comp.pm b/lib/GRNOC/Simp/Comp.pm
@@ -15,7 +15,7 @@ use GRNOC::Config;
 use GRNOC::Log;
 use GRNOC::Simp::Comp::Worker;
 
-our $VERSION = '1.8.1';
+our $VERSION = '1.8.2';
 
 ### REQUIRED ATTRIBUTES ###
 

diff --git a/lib/GRNOC/Simp/Data.pm b/lib/GRNOC/Simp/Data.pm
@@ -13,7 +13,7 @@ use GRNOC::Config;
 use GRNOC::Log;
 use GRNOC::Simp::Data::Worker;
 
-our $VERSION = '1.8.1';
+our $VERSION = '1.8.2';
 
 =head2 public attributes
 =over 12

diff --git a/lib/GRNOC/Simp/Poller.pm b/lib/GRNOC/Simp/Poller.pm
@@ -15,7 +15,7 @@ use GRNOC::Config;
 use GRNOC::Log;
 use GRNOC::Simp::Poller::Worker;
 
-our $VERSION = '1.8.1';
+our $VERSION = '1.8.2';
 
 ### Required Attributes ###
 =head2 public attributes

diff --git a/lib/GRNOC/Simp/TSDS.pm b/lib/GRNOC/Simp/TSDS.pm
@@ -3,7 +3,7 @@ package GRNOC::Simp::TSDS;
 use strict;
 use warnings;
 
-our $VERSION = '1.8.1';
+our $VERSION = '1.8.2';
 
 =head1 NAME
 

diff --git a/simp-comp.spec b/simp-comp.spec
@@ -1,6 +1,6 @@
 Summary: A system for fetching data from simp and compiling the data into a composite
 Name: simp-comp
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{dist}
 License: GRNOC
 Group: GRNOC

diff --git a/simp-data.spec b/simp-data.spec
@@ -1,6 +1,6 @@
 Summary: A small system for fetching SNMP data from redis and returning it via RabbitMQ
 Name: simp-data
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{dist}
 License: GRNOC
 Group: GRNOC

diff --git a/simp-monitor.spec b/simp-monitor.spec
@@ -1,5 +1,5 @@
 Name: simp-monitor
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{?dist}
 Summary: A functionality to monitor SIMP
 License: GRNOC

diff --git a/simp-poller.spec b/simp-poller.spec
@@ -1,6 +1,6 @@
 Summary: A small system for gathering large amounts of SNMP data and pushing them into redis
 Name: simp-poller
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{dist}
 License: GRNOC
 Group: GRNOC

diff --git a/simp-tsds.spec b/simp-tsds.spec
@@ -1,6 +1,6 @@
 Summary: SIMP TSDS Collector
 Name: simp-tsds
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{dist}
 License: APL 2.0
 Group: Network

diff --git a/t/conf/composites/fujitsu_optical.xml b/t/conf/composites/fujitsu_optical.xml
@@ -11,18 +11,25 @@
     </variables>
 
     <data>
-        <meta name="intf" source="shelf" />
+        <meta name="intf"  source="shelf" />
         <meta name="shelf" source="shelf" />
-        <meta name="slot" source="slot" />
-        <meta name="sub" source="sub" />
-        <meta name="port" source="port" />
+        <meta name="slot"  source="slot" />
+        <meta name="sub"   source="sub" />
+        <meta name="port"  source="port" />
         <value name="rxpower" source="1.3.6.1.4.1.211.1.24.12.800.8.1.3.1.shelf.1.slot.1.sub.1.port.6.0.1.1.0" />
         <value name="txpower" source="1.3.6.1.4.1.211.1.24.12.800.8.1.3.1.shelf.1.slot.1.sub.1.port.13.0.0.1.0" />
     </data>
 
     <conversions>
-        <replace this='${}' with='Shelf ${shelf} - Slot ${slot}.${sub} - Port ${port}'>
-            <data name="intf" />
+        <replace this='(\d+)' with='sub {return chr($_[1]);}'>
+            <data name="shelf" />
+            <data name="slot" />
+            <data name="sub" />
+            <data name="port" />
+        </replace>
+
+        <replace this="${}" with="Shelf ${shelf} - Slot ${slot}.${sub} - Port ${port}">
+            <data name="intf"/>
         </replace>
 
         <drop>