Merge ~afreiberger/charm-grafana:fix-test-14-race into charm-grafana:master

[Drew Freiberger]

Resolve race between port change and dashboard ingestion

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

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

[Celia Wang (ziyiwang)]

LGTM

review: Approve

[Peter Sabaini (peter-sabaini)]

lgtm

review: Approve

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

Change successfully merged at revision 288a04ed93f649cf5962402e020b8aa7f2a7c987

diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
index f9e9a94..31c364b 100644
--- a/src/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -333,6 +333,9 @@ def config_changed():
         remove_state("grafana.admin_password.set")
     if config.changed("install_file") and config.get("install_file"):
         remove_state("grafana.installed")
+    if config.changed("port"):
+        # must restart grafana after port-change before updating dashboards
+        remove_state("grafana.started")
     remove_state("grafana.nagios-setup.completed")