Merge ~afreiberger/charm-grafana:lp1805721 into ~prometheus-charmers/charm-grafana:master

Proposed by Drew Freiberger
Status: Merged
Approved by: Chris Sanders
Approved revision: 35e7090067249f3b1e455a9db1ff1f6bd9cf57e0
Merged at revision: d30537fd473767a5dd51eab32897f3e5c527936e
Proposed branch: ~afreiberger/charm-grafana:lp1805721
Merge into: ~prometheus-charmers/charm-grafana:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/grafana.py (+1/-1)
Reviewer Review Type Date Requested Status
Chris Sanders (community) Approve
Review via email: mp+359870@code.launchpad.net

Commit message

added config[external_network] to list of ignored metrics for rendering openstack dash

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Chris Sanders (chris.sanders) wrote :

One trivial in-line and I think it's good

review: Needs Fixing
Revision history for this message
Chris Sanders (chris.sanders) wrote :

lgtm

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision d30537fd473767a5dd51eab32897f3e5c527936e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/grafana.py b/reactive/grafana.py
2index 01a6263..f98e11c 100644
3--- a/reactive/grafana.py
4+++ b/reactive/grafana.py
5@@ -522,7 +522,7 @@ def generate_prometheus_dashboards(gf_adminpasswd, ds):
6 ignore_metrics = ['by_cloud_status', 'group_left', 'count_values',
7 'nova_service_status', 'hypervisor_hostname', 'external_network',
8 'ip_type', 'instance_state', 'network_name', 'subnet_name',
9- 'ip_status', 'neutron_net'
10+ 'ip_status', 'neutron_net', config['external_network']
11 ]
12 prom_metrics.extend(ignore_metrics)
13 for filename in os.listdir(templates_dir):

Subscribers

People subscribed via source and target branches