Merge "Remove usage of deprecated filter_nodes function"
This commit is contained in:
commit
01c6fd5820
@ -24,10 +24,10 @@ $current_roles = hiera('roles')
|
||||
$network_metadata = hiera_hash('network_metadata')
|
||||
|
||||
$elasticsearch_kibana = hiera_hash('elasticsearch_kibana', {})
|
||||
$es_nodes = filter_nodes(hiera('nodes'), 'role', 'elasticsearch_kibana')
|
||||
$es_nodes = get_nodes_hash_by_roles($network_metadata, ['elasticsearch_kibana'])
|
||||
|
||||
$influxdb_grafana = hiera_hash('influxdb_grafana', {})
|
||||
$influxdb_nodes = filter_nodes(hiera('nodes'), 'role', 'influxdb_grafana')
|
||||
$influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
|
||||
|
||||
if $lma_collector['environment_label'] != '' {
|
||||
$environment_label = $lma_collector['environment_label']
|
||||
|
@ -58,7 +58,7 @@ if $alerting_mode == 'remote' {
|
||||
$nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr']
|
||||
} else {
|
||||
# compatibility with the LMA Infrastructure Alerting plugin 0.8
|
||||
$nagios_nodes = filter_nodes(hiera('nodes'), 'role', 'infrastructure_alerting')
|
||||
$nagios_nodes = get_nodes_hash_by_roles($network_metadata, ['infrastructure_alerting'])
|
||||
$nagios_server = $nagios_nodes[0]['internal_address']
|
||||
}
|
||||
$nagios_user = $lma_infra_alerting['nagios_user']
|
||||
|
@ -432,7 +432,7 @@ if $influxdb_mode != 'disabled' {
|
||||
} else {
|
||||
# compatibility with the InfluxDB-Grafana plugin 0.8
|
||||
$influxdb_grafana = hiera_hash('influxdb_grafana', {})
|
||||
$influxdb_nodes = filter_nodes(hiera('nodes'), 'role', 'influxdb_grafana')
|
||||
$influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
|
||||
$influxdb_server = $influxdb_nodes[0]['internal_address']
|
||||
}
|
||||
} else {
|
||||
@ -476,7 +476,7 @@ if $alerting_mode == 'remote' {
|
||||
$nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr']
|
||||
} else {
|
||||
# compatibility with the LMA Infrastructure Alerting plugin 0.8
|
||||
$nagios_nodes = filter_nodes(hiera('nodes'), 'role', 'infrastructure_alerting')
|
||||
$nagios_nodes = get_nodes_hash_by_roles($network_metadata, ['infrastructure_alerting'])
|
||||
$nagios_server = $nagios_nodes[0]['internal_address']
|
||||
}
|
||||
$nagios_user = $lma_infra_alerting['nagios_user']
|
||||
|
Loading…
Reference in New Issue
Block a user