updating data sources according to

data type changes

Author: peekjef72

grafana_snapshots/cli.py

@@ -245,9 +245,13 @@ def main():
          sys.exit(2)
 
       for dtsrc in dtsrcs:
-         datasources[dtsrc['name']] = dtsrc['id']
-         if 'isDefault' in dtsrc and dtsrc['isDefault']:
-            datasources['default'] = dtsrc['id']
+         if 'uid' not in dtsrc:
+            datasources[dtsrc['name']] = dtsrc['id']
+            if 'isDefault' in dtsrc and dtsrc['isDefault']:
+               datasources['default'] = dtsrc['id']
+         else:
+            datasources[dtsrc['uid']] = dtsrc['id']
+
       if args.verbose:
          print('datasources OK.')
 

grafana_snapshots/grafanaData.py

@@ -310,7 +310,11 @@ def get_dashboard_data(self):
                   print("target-type is 'row': skipped")
                continue
 
-            if dtsrc in self.datasources and targets is not None:
+            if isinstance(dtsrc, dict):
+               dtsrc = dtsrc['uid']
+            # else:
+            #    ff
+            if (dtsrc in self.datasources or dtsrc == '-- Mixed --' ) and targets is not None:
 
 #              print('dt: {0}'.format(datasources[dtsrc]))
                for target in targets:
@@ -323,6 +327,10 @@ def get_dashboard_data(self):
                   if 'format' in target and target['format'] == 'table':
                      query_type = 'query'
 
+                  # check if expr is defined or and unconfigurated query
+                  if 'expr' not in target:
+                     print("target expr is not defined: skipped!")
+                     continue
 
                   # check if target expr contains variable ($var)
                   expr = target['expr']
@@ -350,8 +358,19 @@ def get_dashboard_data(self):
                      }
                   if self.debug:
                      print("query GET datasource proxy uri: {0}".format(self.api.client.url))
+                  # determine datasource name if global name is 'mixed'
+                  if dtsrc == '-- Mixed --' and 'datasource' in target:
+                     datasource_name = target['datasource']
+                     if isinstance(datasource_name, dict):
+                        datasource_name = datasource_name['uid']
+                  else:
+                     datasource_name = dtsrc
+                  if not datasource_name in self.datasources:
+                     print("datasource '{0}' was not found".format(datasource_name))
+                     continue
+
                   try:
-                     content = self.api.datasource.get_datasource_proxy_data( str(self.datasources[dtsrc]), **params )
+                     content = self.api.datasource.get_datasource_proxy_data( str(self.datasources[datasource_name]), **params )
                   except:
                      print('invalid results...')
                      return False