Merge branch '114.grafana-instance-label-remove-port-number' into 'develop'

Don't display the port number in Grafana dash tooltips

See merge request !267

morph/grid/local/grid.nix

@@ -131,7 +131,7 @@ let
   };
 
   # TBD: derive these automatically:
-  paymentExporterTargets = [ "payments" ];
+  paymentExporterTargets = [ "payments.monitoringvpn" ];
   blackboxExporterHttpsTargets = [
     # "https://private.storage/"
     # "https://payments.private.storage/"

morph/grid/production/grid.nix

@@ -114,7 +114,7 @@ let
     storage005 = { vpnIP = "172.23.23.25"; stateVersion = "19.03"; };
   };
 
-  paymentExporterTargets = [ "payments" ];
+  paymentExporterTargets = [ "payments.monitoringvpn" ];
   blackboxExporterHttpsTargets = [
     "https://private.storage/"
     "https://www.private.storage/"

morph/grid/testing/grid.nix

@@ -79,7 +79,7 @@ let
   };
 
   # TBD: derive these automatically:
-  paymentExporterTargets = [ "payments" ];
+  paymentExporterTargets = [ "payments.monitoringvpn" ];
   blackboxExporterHttpsTargets = [
     "https://privatestorage-staging.com/"
     "https://www.privatestorage-staging.com/"