Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.1.0 #25

Merged
merged 8 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
cookbook-rb-monitor CHANGELOG
===============

## 0.1.0

- Daniel Castro
- [1af6337] fix add flow sensors to manager
- [2994471] add function to register sensors in proxy

## 0.0.10

- Miguel Negrón
- [c827e71] Merge pull request #22 from redBorder/bugfix/18354_device_sensors_not_in_config

## 0.1.0
## 0.9.0

- Miguel Alvarez
- [d89a1db] Fix sensor_name array invalid
Expand Down Expand Up @@ -40,4 +46,3 @@ cookbook-rb-monitor CHANGELOG
## 0.0.1
-----
- [ejimenez] - Initial skel

7 changes: 6 additions & 1 deletion resources/libraries/rbmonitor_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@ def update_config(resource)
update_cluster_config(resource)
update_service_config(resource)
update_manager_config(resource)
update_sensor_config(resource)

if resource['managers'] && !resource['managers'].empty?
update_sensor_config(resource)
else
update_sensor_proxyips(resource)
end

node.default['redborder']['monitor']['config']['conf'] = {
'debug': log_level,
Expand Down
8 changes: 7 additions & 1 deletion resources/libraries/update_sensor_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@ def update_sensor_config(resource)
# FLOW SENSORS
flow_nodes = resource['flow_nodes']
manager_list = resource['managers']

begin
if flow_nodes && !manager_list.empty?
# Title of section
node.default['redborder']['monitor']['config']['sensors'].push('/* REMOTE SENSORS, MONITORED ON ANY MANAGER */')
manager_index = manager_list.find_index(resource['hostname'])

flow_nodes.each_with_index do |fnode, findex|
next unless !fnode['redborder']['monitors'].empty? && fnode['ipaddress'] && fnode['redborder']['parent_id'].nil?

fnode_name = fnode['rbname'].nil? ? fnode.name : fnode['rbname']
fnode_count = fnode['redborder']['monitors'].size
if findex % manager_list.length == manager_index && fnode['redborder'] && !fnode['redborder']['monitors'].size.empty?

if findex % manager_list.length == manager_index && fnode['redborder'] && !fnode['redborder']['monitors'].empty?
# Title of sensor
node.default['redborder']['monitor']['config']['sensors'].push("/* Node: #{fnode_name} Monitors: #{fnode_count} */")
sensor = {
Expand All @@ -46,16 +49,19 @@ def update_sensor_config(resource)
# DEVICES SENSORS
device_nodes = resource['device_nodes']
manager_list = node['redborder']['managers_list']

begin
if device_nodes && !manager_list.empty?
# Title of section
node.default['redborder']['monitor']['config']['sensors'].push('/* DEVICE SENSORS */')
manager_index = manager_list.find_index(resource['hostname'])

device_nodes.each_with_index do |dnode, dindex|
next unless !dnode['redborder']['monitors'].empty? && dnode['ipaddress'] && dnode['redborder']['parent_id'].nil?

dnode_name = dnode['rbname'].nil? ? dnode.name : dnode['rbname']
dnode_count = dnode['redborder']['monitors'].size

if dindex % manager_list.length == manager_index && dnode['redborder'] && !dnode['redborder']['monitors'].empty?
# Title of sensor
node.default['redborder']['monitor']['config']['sensors'].push("/* Node: #{dnode_name} Monitors: #{dnode_count} */")
Expand Down
82 changes: 82 additions & 0 deletions resources/libraries/update_sensor_proxyips.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
module Rbmonitor
module Helpers
def update_sensor_proxyips(resource)
# SENSOR MONITORIZATION FOR PROXY AND IPS

# TODO: Refactor
# FLOW SENSORS
flow_nodes = resource['flow_nodes']
begin
if flow_nodes
# Title of section
node.default['redborder']['monitor']['config']['sensors'].push('/* REMOTE SENSORS */')

flow_nodes.each do |fnode|
next unless !fnode['redborder']['monitors'].empty? && fnode['ipaddress']

fnode_name = fnode['rbname'] || fnode.name
fnode_count = fnode['redborder']['monitors']&.size || 0

if fnode['redborder'] && !fnode['redborder']['monitors'].empty?
# Title of sensor
node.default['redborder']['monitor']['config']['sensors'].push("/* Node: #{fnode_name} Monitors: #{fnode_count} */")
sensor = {
'timeout': 5,
'sensor_name': fnode_name,
'sensor_ip': fnode['ipaddress'],
'community': (fnode['redborder']['snmp_community'].nil? || fnode['redborder']['snmp_community'] == '') ? 'public' : fnode['redborder']['snmp_community'].to_s,
'snmp_version' => (fnode['redborder']['snmp_version'].nil? || fnode['redborder']['snmp_version'] == '') ? '2c' : fnode['redborder']['snmp_version'].to_s,
'enrichment' => enrich(fnode),
'monitors' => monitors(fnode),
}
node.default['redborder']['monitor']['count'] = node.default['redborder']['monitor']['count'] + fnode['redborder']['monitors'].length
node.default['redborder']['monitor']['config']['sensors'].push(sensor)
else
# The sensor is registered in another manager
node.default['redborder']['monitor']['config']['sensors'].push("/* Node: #{fnode_name} Monitors: #{fnode_count} (not in this manager) */")
end
end
end
rescue
puts 'Cant access to flow sensor, skipping...'
end

# DEVICES SENSORS
device_nodes = resource['device_nodes']
begin
if device_nodes
# Title of section
node.default['redborder']['monitor']['config']['sensors'].push('/* DEVICE SENSORS */')

device_nodes.each do |dnode|
next unless !dnode['redborder']['monitors'].empty? && dnode['ipaddress']

dnode_name = dnode['rbname'] || dnode.name
dnode_count = dnode['redborder']['monitors'].size

if dnode['redborder'] && !dnode['redborder']['monitors'].empty?
# Title of sensor
node.default['redborder']['monitor']['config']['sensors'].push("/* Node: #{dnode_name} Monitors: #{dnode_count} */")
sensor = {
'timeout': 5,
'sensor_name': dnode_name,
'sensor_ip': dnode['ipaddress'],
'community': (dnode['redborder']['snmp_community'].nil? || dnode['redborder']['snmp_community'] == '') ? 'public' : dnode['redborder']['snmp_community'].to_s,
'snmp_version': (dnode['redborder']['snmp_version'].nil? || dnode['redborder']['snmp_version'] == '') ? '2c' : dnode['redborder']['snmp_version'].to_s,
'enrichment' => enrich(dnode),
'monitors' => monitors(dnode),
}
node.default['redborder']['monitor']['count'] = node.default['redborder']['monitor']['count'] + dnode['redborder']['monitors'].length
node.default['redborder']['monitor']['config']['sensors'].push(sensor)
else
# The sensor is registered in another manager
node.default['redborder']['monitor']['config']['sensors'].push("/* Node: #{dnode_name} Monitors: #{dnode_count} (not in this manager) */")
end
end
end
rescue
puts 'Cant access to device sensor, skipping...'
end
end
end
end
2 changes: 1 addition & 1 deletion resources/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
maintainer_email 'git@redborder.com'
license 'AGPL-3.0'
description 'Installs/Configures rb-monitor'
version '0.0.10'
version '0.1.0'
Loading