Merge the "cloud" grafana dashboard into the normal dashboard (#4007)

automerge

book/src/testnet-participation.md

@@ -40,7 +40,7 @@ $ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1,
 Inspect the blockexplorer at [http://beta.testnet.solana.com/](http://beta.testnet.solana.com/) for activity.
 
 View the [metrics dashboard](
-https://metrics.solana.com:3000/d/U9-26Cqmk/testnet-monitor-cloud?refresh=60s&orgId=2&var-testnet=testnet-beta&var-hostid=All)
+https://metrics.solana.com:3000/d/testnet-beta/testnet-monitor-beta?var-testnet=testnet-beta)
 for more detail on cluster activity.
 
 ### Validator Setup

metrics/adjust-dashboard-for-channel.py

@@ -24,7 +24,17 @@ if channel == 'stable':
     # testnet databases
     data['title'] = 'Testnet Monitor'
     data['uid'] = 'testnet'
-    data['templating']['list'] = [{'allValue': None,
+    data['templating']['list'] = [{'current': {'text': '$datasource',
+                                               'value': '$datasource'},
+                                   'hide': 1,
+                                   'label': 'Data Source',
+                                   'name': 'datasource',
+                                   'options': [],
+                                   'query': 'influxdb',
+                                   'refresh': 1,
+                                   'regex': '',
+                                   'type': 'datasource'},
+                                  {'allValue': None,
                                    'current': {'text': 'testnet',
                                                'value': 'testnet'},
                                    'hide': 1,
@@ -45,10 +55,20 @@ else:
     # databases
     data['title'] = 'Testnet Monitor ({})'.format(channel)
     data['uid'] = 'testnet-' + channel
-    data['templating']['list'] = [{'allValue': ".*",
+    data['templating']['list'] = [{'current': {'text': '$datasource',
+                                               'value': '$datasource'},
+                                   'hide': 1,
+                                   'label': 'Data Source',
+                                   'name': 'datasource',
+                                   'options': [],
+                                   'query': 'influxdb',
+                                   'refresh': 1,
+                                   'regex': '',
+                                   'type': 'datasource'},
+                                   {'allValue': ".*",
                                    'current': {'text': 'testnet',
                                                'value': 'testnet'},
-                                   'datasource': 'Solana Influx Cloud (read-only)',
+                                   'datasource': '$datasource',
                                    'hide': 1,
                                    'includeAll': False,
                                    'label': 'Testnet',
@@ -65,7 +85,7 @@ else:
                                    'type': 'query',
                                    'useTags': False},
                                    {'allValue': ".*",
-                                    'datasource': 'Solana Influx Cloud (read-only)',
+                                    'datasource': '$datasource',
                                     'hide': 0,
                                     'includeAll': True,
                                     'label': 'HostID',