From c47a75530e860aa87bf132b6dfc8b8e11e7de02b Mon Sep 17 00:00:00 2001 From: Miguel Alvarez Date: Fri, 5 Jul 2024 17:26:53 +0100 Subject: [PATCH 1/5] Fix sensor name for monitor --- resources/libraries/update_manager_config.rb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/resources/libraries/update_manager_config.rb b/resources/libraries/update_manager_config.rb index 95ef72d..bf80a0c 100644 --- a/resources/libraries/update_manager_config.rb +++ b/resources/libraries/update_manager_config.rb @@ -187,14 +187,21 @@ def update_manager_config(resource) node.default['redborder']['monitor']['count'] = node.default['redborder']['monitor']['count'] + 1 end + sensor_name = if node['redborder']['ips'] && !node['redborder']['cloud'] + node['rbname'] + else + resource['hostname'] + end + manager_sensor = { - 'timeout': 5, - 'sensor_name': resource['hostname'], - 'sensor_ip': resource['hostip'], - 'community': resource['community'], - 'snmp_version': '2c', - 'monitors': manager_monitors, + 'timeout' => 5, + 'sensor_name' => sensor_name['hostname'], + 'sensor_ip' => resource['hostip'], + 'community' => resource['community'], + 'snmp_version' => '2c', + 'monitors' => manager_monitors, } + # Finally, add manager sensor to sensors array in config node.default['redborder']['monitor']['config']['sensors'].push(manager_sensor) end From d89a1dbee1584373e9cb1bde2fa81b568e03d3e4 Mon Sep 17 00:00:00 2001 From: Miguel Alvarez Date: Fri, 5 Jul 2024 17:27:19 +0100 Subject: [PATCH 2/5] Fix sensor_name array invalid --- resources/libraries/update_manager_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/libraries/update_manager_config.rb b/resources/libraries/update_manager_config.rb index bf80a0c..4693f2a 100644 --- a/resources/libraries/update_manager_config.rb +++ b/resources/libraries/update_manager_config.rb @@ -195,7 +195,7 @@ def update_manager_config(resource) manager_sensor = { 'timeout' => 5, - 'sensor_name' => sensor_name['hostname'], + 'sensor_name' => sensor_name, 'sensor_ip' => resource['hostip'], 'community' => resource['community'], 'snmp_version' => '2c', From 1f2cdb649abaafe5f2c7e52b89a4a333c9ead326 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Fri, 16 Aug 2024 11:53:17 +0000 Subject: [PATCH 3/5] metadata update --- CHANGELOG.md | 9 +++++++++ resources/metadata.rb | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b953fb..d3a480b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ cookbook-rb-monitor CHANGELOG =============== +## 0.0.9 + + - Luis Blanco + - [58d9c3d] Merge pull request #20 from redBorder/feature/17731_ips_ssh_version + - [cf3a487] Merge branch 'master' into feature/17731_ips_ssh_version + - Miguel Alvarez + - [d89a1db] Fix sensor_name array invalid + - [c47a755] Fix sensor name for monitor + ## 0.0.8 - Miguel Negrón diff --git a/resources/metadata.rb b/resources/metadata.rb index 2b368d1..78a6c55 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -3,4 +3,4 @@ maintainer_email 'git@redborder.com' license 'AGPL-3.0' description 'Installs/Configures rb-monitor' -version '0.0.8' +version '0.0.9' From 2d1d067c2e8ed26004e8871eec187518518e5c15 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Fri, 16 Aug 2024 11:55:47 +0000 Subject: [PATCH 4/5] fix changelog --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3a480b..eb5c3a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,6 @@ cookbook-rb-monitor CHANGELOG ## 0.0.9 - - Luis Blanco - - [58d9c3d] Merge pull request #20 from redBorder/feature/17731_ips_ssh_version - - [cf3a487] Merge branch 'master' into feature/17731_ips_ssh_version - Miguel Alvarez - [d89a1db] Fix sensor_name array invalid - [c47a755] Fix sensor name for monitor From 08540959e3b8dfabf9ffb023a2d2fb3b4732a811 Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Fri, 16 Aug 2024 13:16:25 +0000 Subject: [PATCH 5/5] update changelog to minor --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb5c3a2..61ad458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ cookbook-rb-monitor CHANGELOG =============== -## 0.0.9 +## 0.1.0 - Miguel Alvarez - [d89a1db] Fix sensor_name array invalid