Merge ~npochet/charm-grafana:fix-1827257 into ~prometheus-charmers/charm-grafana:master

[Nicolas Pochet]

Make the `neutron_public_ip_usage` metric optional

Fixes LP:1827257

Make the `neutron_public_ip_usage` metric optional

Fixes LP:1827257

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Peter Sabaini (peter-sabaini)]

Hey Nicolas,

thanks for the bug+patch. A style nit-- as in IS we have max-column limit of 120 chars by policy the additional wrapping is seems superfluous. Mind to update the patch for this?

review: Needs Fixing

[Nicolas Pochet (npochet)]

Hey Peter,

Sorry, autopep8 was enabled. I just reverted the change.
Thanks for the review!

[Peter Sabaini (peter-sabaini)]

LGTM, thanks

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 88eb87ae0916a7f421c631ef63ab4b208fb7ff24

diff --git a/reactive/grafana.py b/reactive/grafana.py
index f98e11c..7d1c422 100644
--- a/reactive/grafana.py
+++ b/reactive/grafana.py
@@ -522,8 +522,8 @@ def generate_prometheus_dashboards(gf_adminpasswd, ds):
     ignore_metrics = ['by_cloud_status', 'group_left', 'count_values',
                       'nova_service_status', 'hypervisor_hostname', 'external_network',
                       'ip_type', 'instance_state', 'network_name', 'subnet_name',
-                      'ip_status', 'neutron_net', config['external_network']
-                      ]
+                      'ip_status', 'neutron_net', config['external_network'],
+                      'neutron_public_ip_usage']
     prom_metrics.extend(ignore_metrics)
     for filename in os.listdir(templates_dir):
         dashboard_str = render(source=filename,