diff options
Diffstat (limited to 'roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py')
| -rw-r--r-- | roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py b/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py index 50e34865..76e47056 100644 --- a/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py +++ b/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py @@ -7,11 +7,13 @@ from ansible import errors _multitarget_id_map_ = { - "blackbox/probe": (lambda vars, config: (vars['inventory_hostname'], "%s-%s" % (config['svc_kind'], config['svc_instance']))), - "ssl/probe": (lambda vars, config: (vars['inventory_hostname'], "%s-%s-%s" % (config['module'], config['sslcert_instance'], vars['inventory_hostname']))), - "ipmi/remote": (lambda vars, config: (vars['inventory_hostname'], vars['inventory_hostname'])), - "nut/ups": (lambda vars, config: (vars['inventory_hostname'], config['ups'])), - "whawty-nginx-sso": (lambda vars, config: (vars['inventory_hostname'], "%s-%s" % (config['app_instance'], vars['inventory_hostname']))), + "blackbox/probe": (lambda vars, config: "%s-%s" % (config['svc_kind'], config['svc_instance'])), + "ssl/probe": (lambda vars, config: "%s-%s-%s" % (config['module'], config['sslcert_instance'], vars['inventory_hostname'])), + "ipmi/remote": (lambda vars, config: vars['inventory_hostname']), + "nut/ups": (lambda vars, config: config['ups']), + "snmp/probe": (lambda vars, config: config['snmp_instance']), + "modbus/probe": (lambda vars, config: config['modbus_instance']), + "whawty-nginx-sso": (lambda vars, config: "%s-%s" % (config['app_instance'], vars['inventory_hostname'])), } @@ -23,12 +25,8 @@ def prometheus_job_targets(jobs, vars): if multitarget_config_varname in vars: for exporter_hostname, configs in vars[multitarget_config_varname].items(): for config in configs: - if job in _multitarget_id_map_: - instance, id = _multitarget_id_map_[job](vars, config) - else: - id = config['instance'] - instance = config['instance'] - result.append({'_id': id, 'job': job, 'instance': instance, 'enabled': True, + id = _multitarget_id_map_[job](vars, config) + result.append({'_id': id, 'job': job, 'instance': vars['inventory_hostname'], 'enabled': True, 'exporter_hostname': exporter_hostname, 'config': config}) else: |