update grafana example with awesome sensor logger app (#855)

Author: jovezhong

examples/awesome-sensor-logger/README.md

@@ -15,20 +15,18 @@ Install [Docker Desktop](https://docs.docker.com/desktop/) and fork this repo or
 Wait for about half a minute to have all containers up running.
 
 ### Step 2: install mobile app and push data to Proton
-Download Sensor Logger at www.tszheichoi.com/sensorlogger. 
+Download Sensor Logger at www.tszheichoi.com/sensorlogger.
 
 | Android | iOS |
 |:-:|:-:|
 | [<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="50">](https://play.google.com/store/apps/details?id=com.kelvin.sensorapp&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1) | [<img src="https://developer.apple.com/app-store/marketing/guidelines/images/badge-example-preferred_2x.png" height="50">](https://apps.apple.com/app/id1531582925) |
 
-Open the app, and go to the settings page, by clicking the button at the bottom. 
+Open the app, and go to the settings page, by clicking the button at the bottom.
 1. Click the `Data Streaming` menu.
 2. Turn on `Enable HTTP Push`.
 3. Get your IP for your server (on Mac, you can hold Option key and click the WiFi icon to get the IP address), and set the `Push URL` as `http://<ip>:8000`
 4. Optionally, you can turn on `Skip Writing`.
 
 ### Step 3: view the live dashboard in Grafana
 
-In your laptop/server, access `http://localhost:3000` and open the `Phone Sensor`
-
-
+In your laptop/server, access the Grafana UI via `http://localhost:3000` and open the `Phone Sensor` dashboard.

examples/awesome-sensor-logger/docker-compose.yml

@@ -1,29 +1,35 @@
 services:
-  proton:
+  timeplus:
     image: d.timeplus.com/timeplus-io/proton:latest
     pull_policy: always
     ports:
       - 3218:3218 #http port for JDBC driver, default streaming mode
       - 8123:8123 #http port for JDBC driver, default batch mode
       - 8463:8463 #tcp port for go driver or grafana plugin
-    volumes:
-      - ./init_sql:/docker-entrypoint-initdb.d
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:8123/?query=show+create+phone || exit 1
+      test: ["CMD", "curl", "http://localhost:8123"]
       interval: 2s
       timeout: 10s
       retries: 3
       start_period: 10s
 
+  init_timeplus:
+    image: curlimages/curl
+    command: >
+      sh -c "echo 'CREATE STREAM IF NOT EXISTS phone(raw string)' | curl timeplus:8123 --data-binary @-"
+    depends_on:
+      timeplus:
+        condition: service_healthy
+
   proxy:
     image: docker.timeplus.com/timeplus/sensor-logger-proxy
     ports:
       - 8000:3000 #expose internal port 3000 as 8000, avoiding conflicts with Grafana. This will forward HTTP POST to proton:3218
     environment:
-      HOST: proton
+      HOST: timeplus
       STREAM: phone
     depends_on:
-      - proton
+      - timeplus
 
   grafana:
     image: grafana/grafana:latest
@@ -33,10 +39,10 @@ services:
     environment:
       GF_AUTH_ANONYMOUS_ENABLED: 1
       GF_AUTH_ANONYMOUS_ORG_ROLE: Admin
-      GF_INSTALL_PLUGINS: timeplus-proton-datasource
+      GF_INSTALL_PLUGINS: https://d.timeplus.com/grafana/timeplus-proton-datasource-2.0.0.zip;timeplus-proton-datasource
       GF_LOG_LEVEL: error
     volumes:
       - ./grafana_provisioning:/etc/grafana/provisioning
     depends_on:
-      proton:
+      timeplus:
         condition: service_healthy

examples/awesome-sensor-logger/grafana_provisioning/dashboards/grafana_dashboard.json

@@ -105,8 +105,7 @@
             "type": "timeplus-proton-datasource",
             "uid": "c24e0faf-1490-4321-a373-7b2b07ca2e38"
           },
-          "isStreaming": true,
-          "queryText": "select array_join(xyz) as v, multi_if(v[1]=1,'x',v[1]=2,'y','z') as axis, v[2] as value, time from(\nselect to_datetime64((p:time::int64)/1000000000,3) as time,[[1,to_float32_or_zero(p:values.x)],[2,to_float32_or_zero(p:values.y)],[3,to_float32_or_zero(p:values.z)]] as xyz from (select array_join(json_extract_array(raw,'payload')) as p from phone where p:name='gyroscope')\n)",
+          "sql": "select array_join(xyz) as v, multi_if(v[1]=1,'x',v[1]=2,'y','z') as axis, v[2] as value, time from(\nselect to_datetime64((p:time::int64)/1000000000,3) as time,[[1,to_float32_or_zero(p:values.x)],[2,to_float32_or_zero(p:values.y)],[3,to_float32_or_zero(p:values.z)]] as xyz from (select array_join(json_extract_array(raw,'payload')) as p from phone where p:name='gyroscope')\n)",
           "refId": "A"
         }
       ],
@@ -168,9 +167,7 @@
       "id": 2,
       "options": {
         "dims": {
-          "exclude": [
-            "z"
-          ]
+          "exclude": ["z"]
         },
         "legend": {
           "calcs": [],
@@ -192,8 +189,7 @@
             "type": "timeplus-proton-datasource",
             "uid": "c24e0faf-1490-4321-a373-7b2b07ca2e38"
           },
-          "isStreaming": true,
-          "queryText": "select to_datetime64((p:time::int64)/1000000000,3) as time,to_float32_or_zero(p:values.x) as x,to_float32_or_zero(p:values.y) as y,to_float32_or_zero(p:values.z) as z from (select array_join(json_extract_array(raw,'payload')) as p from phone where p:name='gyroscope')\n",
+          "sql": "select to_datetime64((p:time::int64)/1000000000,3) as time,to_float32_or_zero(p:values.x) as x,to_float32_or_zero(p:values.y) as y,to_float32_or_zero(p:values.z) as z from (select array_join(json_extract_array(raw,'payload')) as p from phone where p:name='gyroscope')\n",
           "refId": "A"
         }
       ],
@@ -217,4 +213,4 @@
   "uid": "a3406569-2c08-454c-8791-64064366e107",
   "version": 3,
   "weekStart": ""
-}
+}

examples/awesome-sensor-logger/grafana_provisioning/datasources/automatic.yml

@@ -1,26 +1,29 @@
 apiVersion: 1
 
 datasources:
-- name: Proton
-  type: timeplus-proton-datasource
-  uid: c24e0faf-1490-4321-a373-7b2b07ca2e38
-  typeName: Proton
-  access: proxy
-  url: 
-  password:
-  user:
-  database: 
-  isDefault: true
-  basicAuth: false
-  basicAuthUser:
-  basicAuthPassword:
-  withCredentials:
-  jsonData:
-    host: proton
-  readOnly: false
-  secureJsonData:
-    tlsCACert: ""
-    tlsClientCert: ""
-    tlsClientKey: ""
-  version: 1
-  editable: true
+  - name: Proton
+    type: timeplus-proton-datasource
+    uid: c24e0faf-1490-4321-a373-7b2b07ca2e38
+    typeName: Proton
+    access: proxy
+    url:
+    password:
+    user:
+    database:
+    isDefault: true
+    basicAuth: false
+    basicAuthUser:
+    basicAuthPassword:
+    withCredentials:
+    jsonData:
+      host: timeplus
+      tcpPort: 8463
+      httpPort: 3218
+      username: default
+    readOnly: false
+    secureJsonData:
+      tlsCACert: ""
+      tlsClientCert: ""
+      tlsClientKey: ""
+    version: 1
+    editable: true