dsquery: New args; new examples; new db

Author: peekjef72

examples/datasource-smartquery.py

@@ -4,24 +4,42 @@
 
 Example program for submitting a query to a data source.
 
-While the ``--query`` option is obligatory, the ``--store`` option is not.
+While the ``--query`` option is obligatory, the ``--attr`` option is not.
 It will be used to designate the ``database`` name, with e.g. InfluxDB,
-or the ``metric`` name, with e.g. Prometheus.
+or the ``queryType`` name, with e.g. Loki.
 
 Synopsis
 ========
 ::
-
     # Query the InfluxDB 1.x data source on `play.grafana.org`.
     python examples/datasource-smartquery.py --uid=000000002 --query="SHOW RETENTION POLICIES on _internal"
-    python examples/datasource-smartquery.py --uid=000000002 --store=site --query="SHOW FIELD KEYS"
+    python examples/datasource-smartquery.py --uid=000000002 --attr "database:site" --query="SHOW FIELD KEYS"
+    python examples/datasource-smartquery.py --uid 000000002 --query "SELECT sum(\"value\") FROM \"logins.count\" WHERE time >= now() - 5m and time <= now() GROUP BY time(10s) fill(null)"
+
+    #Query the InfluxDB+flux on https://play.grafana.org
+    # fix me : query invalid !
+    python examples/datasource-smartquery.py \
+        --uid M3k6ZPrnz \
+        --query "from(bucket: \"example-bucket\")\\n|> range(start: -1h)|> filter(fn: (r) => r._measurement == \"example-measurement\" and r._field == \"example-field\")"
+
+    // Query the Grafite
+    python examples/datasource-smartquery.py --uid 000000001 --query "aliasByNode(apps.fakesite.web_server_02.counters.requests.count,2)"
 
     # Query the Prometheus data source on `play.grafana.org`.
-    # FIXME: Does not work yet.
-    python \
-        examples/datasource-smartquery.py --uid=000000008 --store=node_boot_time \
+    python examples/datasource-smartquery.py \
+        --uid=000000008 \
         --query='time() - node_boot_time_seconds{job="node", instance=~"demo.do.prometheus.io:.*"}'
 
+    # Query the Loki data source on `play.grafana.org`.
+    python examples/datasource-smartquery.py \
+        --uid=NX9d1VH7k \
+        --query "bytes_over_time({filename=~\".+/json_access.+\", job=~\".*\", instance=~\".*\"}[5m])" \
+        --attr "queryType:instant"
+    python examples/datasource-smartquery.py \
+        --uid=NX9d1VH7k \
+        --query "sum by (status) (count_over_time({filename=~\".+/json_access.+\", job=~\".*\", instance=~\".*\"} | json |  __error__=\"\" [5m]))" \
+        --attr "legendFormat:HTTP Status {{status}}"
+
 """
 import json
 import logging
@@ -39,17 +57,28 @@
 def run(grafana: GrafanaApi):
     parser = OptionParser()
     parser.add_option("--uid", dest="uid", help="Data source UID")
-    parser.add_option("--store", dest="store", help="Database or metric to be addressed")
+    # replace by --attr "database:<store>" or --attr "metric:<metric>"
+    # parser.add_option("--store", dest="store", help="Database or metric to be addressed")
     parser.add_option("--query", dest="query", help="Query expression")
+    parser.add_option("--attr", dest="attrs", action="append", help="key:value pair attribute to send into query")
     (options, args) = parser.parse_args()
     if not options.uid:
         parser.error("Option --uid required")
     if not options.query:
         parser.error("Option --query required")
 
+    attributes = {
+    }
+    if options.attrs is not None and len(options.attrs) > 0 :
+        for attr in options.attrs:
+            (key, val) = attr.split(":")
+            attributes[key] = val
+
     # Query the data source by UID.
     response = grafana.datasource.smartquery(
-        DatasourceIdentifier(uid=options.uid), expression=options.query, store=options.store
+        DatasourceIdentifier(uid=options.uid),
+        options.query,
+        attrs=attributes,
     )
 
     # Display the outcome in JSON format.