From 84d213921c5dcccc6b7cfe30f7782a78002afbc3 Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Tue, 11 Dec 2018 14:49:52 +0100 Subject: [PATCH] added hardwareVersion, changed firmwareVersion --- .../Nuki Smartlock + Bridge (Internals).json | 1704 ++++++++++++++++- 1 file changed, 1615 insertions(+), 89 deletions(-) diff --git a/Grafana/Nuki Smartlock + Bridge (Internals).json b/Grafana/Nuki Smartlock + Bridge (Internals).json index fe903b2..f1e551d 100644 --- a/Grafana/Nuki Smartlock + Bridge (Internals).json +++ b/Grafana/Nuki Smartlock + Bridge (Internals).json @@ -5,7 +5,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "5.3.4" + "version": "5.4.0" }, { "type": "panel", @@ -55,7 +55,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1543579047007, + "iteration": 1544534353348, "links": [], "panels": [ { @@ -184,9 +184,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.state\nFROM \n Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,3", @@ -260,9 +281,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n s.batteryCritical\nFROM \n Smartlock as s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,1", @@ -362,8 +404,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*this is currently unkown*/\nSELECT \n s.serverState\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,1", @@ -462,9 +525,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n COUNT(*) \nFROM \n SmartlockLog AS n,\n Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0", @@ -543,9 +627,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n FORMAT((Tage.Datum / (SELECT COUNT(*) FROM SmartlockLog AS n WHERE n.action = 4) * 7), 0)\nFROM (\n SELECT \n * \n FROM (\n SELECT \n TIMESTAMPDIFF(SECOND, NOW(), ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60))) / -86400 as \"Datum\" /*Hole nur die letzte Zeile*/\n FROM \n SmartlockLog AS n,\n Smartlock AS s\n WHERE s.name = \"$SmartlockName\" \n ORDER BY n.date ASC /*ORDER BY ist wichtig, damit immer die letzte Zeile zur Berechnung verwendet wird!*/\n LIMIT 3\n ) AS RESULT \n ORDER BY RESULT.`Datum` ASC \n LIMIT 1 /*3 - 1 = 2 >> überspringe die letzten 2 Einträge, weil das Datum noch falsch gesetzt war (Initialisierung des Schlosses 2018, aber laut Einträgen 2016)*/\n) AS Tage\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -624,9 +729,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n COUNT(*) \nFROM \n SmartlockLog AS n,\n Smartlock AS s\nWHERE \n n.action = 2 AND\n s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -705,9 +831,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n COUNT(*) \nFROM \n SmartlockLog AS n,\n Smartlock AS s\nWHERE \n n.action = 4 AND\n s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -786,9 +933,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n COUNT(*) \nFROM \n SmartlockLog AS n,\n Smartlock AS s\nWHERE \n n.action in (1,4,5) AND\n s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -868,8 +1036,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*It's unclear until now what this means*/\nSELECT \n s.mode\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "1,2", @@ -954,8 +1143,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n DATE_FORMAT(ADDTIME(s.updateDate, SEC_TO_TIME(s.timezoneOffset*60)),'%d.%m.%Y %H:%i:%s')\nFROM\n Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1018,7 +1228,9 @@ } ], "format": "table", + "group": [], "hide": false, + "metricColumn": "none", "metrics": [ { "field": "select field", @@ -1026,9 +1238,28 @@ "type": "count" } ], + "rawQuery": true, "rawSql": "SELECT\n @row_number:=@row_number + 1 AS \"Nr.\",\n COUNT(*) AS \"Anzahl\", \n n.name AS \"Trigger\" \nFROM \n SmartlockLog AS n, \n Smartlock AS s,\n (SELECT @row_number:=0) AS t\nWHERE n.name != \"\" AND s.name = \"$SmartlockName\"\nGROUP BY n.name \nORDER BY `Anzahl` DESC\n;", "refId": "A", - "timeField": "date" + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "timeField": "date", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "title": "Trigger Ranking", @@ -1089,6 +1320,7 @@ } ], "format": "table", + "group": [], "groupBy": [ { "params": [ @@ -1104,6 +1336,7 @@ } ], "hide": false, + "metricColumn": "none", "metrics": [ { "field": "select field", @@ -1113,6 +1346,7 @@ ], "orderByTime": "ASC", "policy": "default", + "rawQuery": true, "rawSql": "SELECT \n s.name,\n 10.0 AS metric,\n s.longitude,\n s.latitude\n FROM \nSmartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", "refId": "A", "resultFormat": "time_series", @@ -1131,7 +1365,15 @@ ] ], "tags": [], - "timeField": "date" + "timeColumn": "time", + "timeField": "date", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,10", @@ -1205,8 +1447,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CONVERT((HOUR(elapsed.`value`)*60+MINUTE(elapsed.`value`)), DECIMAL)/60\nFROM (\n SELECT \n TIMEDIFF(NOW(), ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60))) AS \"value\"\n FROM \n SmartlockLog AS n,\n Smartlock AS s\n WHERE s.name = \"$SmartlockName\"\n ORDER BY n.date DESC\n LIMIT 1\n ) AS elapsed\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "24,36,48", @@ -1257,12 +1520,34 @@ { "alias": "", "format": "time_series", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n UNIX_TIMESTAMP(ADDTIME(date(n.date), SEC_TO_TIME(s.timezoneOffset*60))) AS time_sec, /*the date() cast will cutoff the time from datetime*/\n COUNT(n.action) AS value,\n \"Aufsperraktionen\" AS metric\nFROM \n SmartlockLog AS n, \n Smartlock AS s\nWHERE \n $__timeFilter(n.date) AND \n n.action in (1,4,5) AND /*Aufsperren, Log 'n' Go oder Kombination aus beidem*/\n s.name = \"$SmartlockName\"\nGROUP BY `time_sec`\nORDER BY time_sec ASC\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": [], "timeFrom": "60d", + "timeRegions": [], "timeShift": null, "title": "Frequentierung in den letzten 60 Tagen", "tooltip": { @@ -1359,9 +1644,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*this is quite not the same as the mainName*/\nSELECT \n s.name\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,3", @@ -1435,8 +1741,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.detachedCylinder\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1521,8 +1848,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CONCAT(FORMAT(CAST(s.totalDegrees AS DECIMAL) / 360,2),\" Runden (\",s.totalDegrees,\"°)\")\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1596,8 +1944,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.singleLock \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1682,8 +2051,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.unlockedToLockedTransitionOffsetDegrees \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1757,8 +2147,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.buttonEnabled \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1843,8 +2254,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.fobPaired \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -1928,9 +2360,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n * \nFROM (\n SELECT \n TIMESTAMPDIFF(SECOND, NOW(), ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60))) / -86400 as \"Datum\" /*Hole nur die letzte Zeile*/\n FROM \n SmartlockLog as n, \n Smartlock as s\n WHERE s.name = \"$SmartlockName\"\n ORDER BY n.date ASC /*ORDER BY ist wichtig, damit immer die letzte Zeile zur Berechnung verwendet wird!*/\n LIMIT 3\n) AS RESULT \nORDER BY RESULT.`Datum` ASC \nLIMIT 1 /*3 - 1 = 2 >> überspringe die letzten 2 Einträge, weil das Datum noch falsch gesetzt war (Initialisierung des Schlosses 2018, aber laut Einträgen 2016)*/\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0", @@ -2004,8 +2457,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.favorite \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2090,8 +2564,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.advertisingMode \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2186,8 +2681,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CASE \n WHEN s.detachedCylinder = 0 THEN \"Inaktiv\"\n ELSE CONCAT(s.unlatchDuration, ' Sekunden')\n END\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2262,8 +2778,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n DATE_FORMAT(ADDTIME(s.creationDate, SEC_TO_TIME(s.timezoneOffset*60)),'%d.%m.%Y %H:%i:%s')\nFROM\n Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2337,8 +2874,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.unlockedPositionOffsetDegrees \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2412,8 +2970,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*Beim Öffnen wird solange gedreht, bis die Türfalle nach innen gezogen wird*/\nSELECT \n s.autoUnlatch \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2498,8 +3077,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.fobAction1 \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2609,8 +3209,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.pairingEnabled\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,1", @@ -2695,8 +3316,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.ledBrightness\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2770,8 +3412,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.automaticBatteryTypeDetection \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2856,8 +3519,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.autoLockTimeout \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -2931,8 +3615,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.daylightSavingMode \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3017,8 +3722,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.lockedPositionOffsetDegrees \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3092,8 +3818,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.singleButtonPressAction \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3203,8 +3950,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.fobAction2\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3309,18 +4077,39 @@ "lineColor": "rgb(31, 120, 193)", "show": false }, - "tableColumn": "firmwareVersion", + "tableColumn": "REVERSE(\n REPLACE(\n INSERT(\n INSERT(\n INSERT(\n INSERT(\n REVERSE(HEX(s.firmwareVersion))\n ,3, 0, '.')\n ,6, 0, '.')\n ,9, 0, '.')\n ,12, 0, '.')\n", "targets": [ { "alias": "", "format": "table", + "group": [], "hide": false, - "rawSql": "SELECT \n s.firmwareVersion \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "metricColumn": "none", + "rawQuery": true, + "rawSql": "SELECT\n REVERSE(\n REPLACE(\n INSERT(\n INSERT(\n INSERT(\n INSERT(\n REVERSE(HEX(s.firmwareVersion))\n ,3, 0, '.')\n ,6, 0, '.')\n ,9, 0, '.')\n ,12, 0, '.')\n ,'0','')\n )\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", - "title": "Firmwareversion", + "title": "Firmware Version", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -3396,8 +4185,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.ledEnabled \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3482,8 +4292,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.batteryType \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3573,8 +4404,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.lngTimeout\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3649,8 +4501,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n CASE \n WHEN s.timezoneOffset > 0 THEN CONCAT(\"GMT +\",FORMAT(CAST(s.timezoneOffset AS DECIMAL)/60,0), \" Stunden\")\n WHEN s.timezoneOffset < 0 THEN CONCAT(\"GMT -\",FORMAT(CAST(s.timezoneOffset AS DECIMAL)/60,0), \" Stunden\")\n ELSE 0\n END\nFROM\n Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3724,8 +4597,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.singleLockedPositionOffsetDegrees \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3799,8 +4693,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.doubleButtonPressAction \nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3910,8 +4825,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n s.fobAction3\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -3962,9 +4898,9 @@ "colorBackground": false, "colorValue": false, "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" + "#629e51", + "#cca300", + "#ba43a9" ], "datasource": "$Datasource", "description": "", @@ -3982,7 +4918,7 @@ "x": 21, "y": 26 }, - "id": 60, + "id": 88, "interval": null, "links": [], "mappingType": 1, @@ -4000,7 +4936,7 @@ "nullPointMode": "connected", "nullText": null, "postfix": "", - "postfixFontSize": "80%", + "postfixFontSize": "50%", "prefix": "", "prefixFontSize": "50%", "rangeMaps": [ @@ -4016,20 +4952,48 @@ "lineColor": "rgb(31, 120, 193)", "show": false }, - "tableColumn": "accountId", + "tableColumn": "REVERSE(\n REPLACE(\n INSERT(\n INSERT(\n INSERT(\n INSERT(\n REVERSE(HEX(s.hardwareVersion))\n ,3, 0, '.')\n ,6, 0, '.')\n ,9, 0, '.')\n ,12, 0, '.')\n", "targets": [ { "alias": "", "format": "table", - "rawSql": "SELECT \n s.accountId\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", - "refId": "A" + "group": [], + "hide": false, + "metricColumn": "none", + "rawQuery": true, + "rawSql": "SELECT\n REVERSE(\n REPLACE(\n INSERT(\n INSERT(\n INSERT(\n INSERT(\n REVERSE(HEX(s.hardwareVersion))\n ,3, 0, '.')\n ,6, 0, '.')\n ,9, 0, '.')\n ,12, 0, '.')\n ,'0','')\n )\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", - "title": "Account Id", + "title": "Hardware Version", "type": "singlestat", "valueFontSize": "80%", - "valueMaps": [], + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], "valueName": "avg" }, { @@ -4095,9 +5059,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CONCAT(AccountsGesamt,\" Gesamt (\",a2.AccountsAktiv, \" Aktiv | \",a1.AccountsGesamt - a2.AccountsAktiv, \" Inaktiv)\") \n FROM (\n SELECT \n COUNT(*) AS AccountsGesamt \n FROM\n SmartlockAuth AS a, \n Smartlock AS s\n WHERE s.name = \"$SmartlockName\"\n ) AS a1,\n (SELECT \n COUNT(*) AS AccountsAktiv \n FROM \n SmartlockAuth AS a,\n Smartlock AS s\n WHERE s.name = \"$SmartlockName\" AND \n a.enabled = TRUE\n ) AS a2\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -4134,7 +5119,7 @@ }, "gridPos": { "h": 2, - "w": 9, + "w": 6, "x": 9, "y": 28 }, @@ -4177,9 +5162,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*\nZeigt den Tag, der durschschnittlich am meisten frequentiert ist (ermittelt durch die Anzahl der Aufsperrungen)\n*/\nSELECT \n RESULT.`Day` \nFROM\n (\n SELECT \n COUNT(n.date) AS `Count`,\n DAYNAME(ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60))) AS `Day`\n FROM \n SmartlockLog AS n, \n Smartlock AS s\n WHERE \n n.action in (1,4,5) AND /*Aufsperren / Log 'n' Go oder Kombination aus beidem*/\n s.name = \"$SmartlockName\"\n GROUP BY `Day`\n ORDER BY `Count` DESC\n LIMIT 1\n ) AS RESULT\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -4216,7 +5222,7 @@ "gridPos": { "h": 2, "w": 6, - "x": 18, + "x": 15, "y": 28 }, "id": 11, @@ -4258,9 +5264,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT RESULT.`Trigger` FROM \n (\n SELECT \n COUNT(*) AS \"Anzahl\", \n n.name AS \"Trigger\" \n FROM \n SmartlockLog AS n, \n Smartlock AS s\n WHERE \n n.name != \"\" AND\n s.name = \"$SmartlockName\"\n GROUP BY n.name \n ORDER BY `Anzahl` DESC\n LIMIT 1\n ) AS RESULT\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -4276,6 +5303,102 @@ ], "valueName": "avg" }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "$Datasource", + "description": "", + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 2, + "w": 3, + "x": 21, + "y": 28 + }, + "id": 60, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "80%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false + }, + "tableColumn": "accountId", + "targets": [ + { + "alias": "", + "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, + "rawSql": "SELECT \n s.accountId\nFROM Smartlock AS s\nWHERE s.name = \"$SmartlockName\"\n;", + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] + } + ], + "thresholds": "", + "title": "Account Id", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [], + "valueName": "avg" + }, { "columns": [], "datasource": "$Datasource", @@ -4312,7 +5435,9 @@ } ], "format": "table", + "group": [], "hide": false, + "metricColumn": "none", "metrics": [ { "field": "select field", @@ -4320,9 +5445,28 @@ "type": "count" } ], - "rawSql": "SELECT\n @row_number:=@row_number + 1 AS \"Nr.\",\n CONCAT(DATE_FORMAT(ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60)),'%d.%m.%Y %H:%i:%s'),' (',DAYNAME(ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60))),')') AS \"Datum\", -- +2 Stunden Aufschlag, da Zeitzone anders\n CASE \n WHEN n.trigger = 0 AND n.name != \"\" THEN CONCAT(n.name, \" (User)\")\n WHEN n.trigger = 0 AND n.name = \"\" THEN \"Positionserkennung (Smartlock)\"\n WHEN n.trigger = 1 THEN \"Manuell\"\n WHEN n.trigger = 2 THEN \"Manuell (Button)\"\n WHEN n.trigger = 3 THEN \"Automatisch\"\n WHEN n.trigger = 4 THEN \"Web\"\n WHEN n.trigger = 5 THEN \"App\" \n WHEN n.trigger = 6 THEN \"Auto Lock\"\n WHEN n.trigger = 255 THEN \"Keypad\"\n ELSE CONCAT(\"[\",n.trigger,\"] - \", \" Undefiniert\")\n END \"Trigger\", \n CASE \n WHEN n.action = 1 THEN \"Aufgesperrt\"\n WHEN n.action = 2 THEN \"Zugesperrt\"\n WHEN n.action = 3 THEN \"Tür geöffnet\"\n WHEN n.action = 4 THEN \"Lock 'n' Go\"\n WHEN n.action = 5 THEN \"Lock 'n' Go + Tür geöffnet\"\n WHEN n.action = 252 THEN \"Initialisiert\"\n WHEN n.action = 253 THEN \"Kalibriert\"\n WHEN n.action = 254 THEN \"Log aktiviert\"\n WHEN n.action = 255 THEN \"Log deaktiviert\"\n ELSE CONCAT(\"[\",n.action,\"] - \", \" Undefiniert\")\n END AS \"Aktion\",\n CASE\n WHEN n.state = 0 THEN \"OK\"\n WHEN n.state = 1 THEN \"Motor blockiert\"\n WHEN n.state = 2 THEN \"Abgebrochen\"\n WHEN n.state = 3 THEN \"Zu neu\"\n WHEN n.state = 4 THEN \"Beschäftigt\"\n WHEN n.state = 5 THEN \"Batterien zu schwach\"\n WHEN n.state = 6 THEN \"Kupplungsfehler\"\n WHEN n.state = 7 THEN \"Motorstromfehler\"\n WHEN n.state = 8 THEN \"Kalibriert\"\n WHEN n.state = 254 THEN \"Anderer Fehler\"\n WHEN n.state = 255 THEN \"Unbekannter Fehler\"\n ELSE CONCAT(\"[\",n.state,\"] - \", \" Undefiniert\")\n END AS \"Status\"\n /*n.trigger AS \"Trigger\" */\n /*n.autoUnlock AS \"Auto-Unlock\" */\n /*n.smartLockId AS \"\" */\n /*n.authId */\n /*n.id */\nFROM \n SmartlockLog AS n, \n Smartlock AS s,\n (SELECT @row_number:=0) AS t\nWHERE s.name = \"$SmartlockName\" \nORDER BY n.date DESC\n;", + "rawQuery": true, + "rawSql": "SELECT\n @row_number:=@row_number + 1 AS \"Nr.\",\n CONCAT(DATE_FORMAT(ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60)),'%d.%m.%Y %H:%i:%s'),' (',DAYNAME(ADDTIME(n.date, SEC_TO_TIME(s.timezoneOffset*60))),')') AS \"Datum\", -- +2 Stunden Aufschlag, da Zeitzone anders\n CASE \n WHEN n.trigger = 0 AND n.name = \"Nuki Web ()\" THEN \"Nuki Web (System/API Call)\"\n WHEN n.trigger = 0 AND n.name != \"\" THEN CONCAT(n.name, \" (User)\")\n WHEN n.trigger = 0 AND n.name = \"\" THEN \"Positionserkennung (Smartlock)\"\n WHEN n.trigger = 1 THEN \"Manuell\"\n WHEN n.trigger = 2 THEN \"Manuell (Button)\"\n WHEN n.trigger = 3 THEN \"Automatisch\"\n WHEN n.trigger = 4 THEN \"Web\"\n WHEN n.trigger = 5 THEN \"App\" \n WHEN n.trigger = 6 THEN \"Auto Lock\"\n WHEN n.trigger = 255 THEN \"Keypad\"\n ELSE CONCAT(\"[\",n.trigger,\"] - \", \" Undefiniert\")\n END \"Trigger\", \n CASE \n WHEN n.action = 1 THEN \"Aufgesperrt\"\n WHEN n.action = 2 THEN \"Zugesperrt\"\n WHEN n.action = 3 THEN \"Tür geöffnet\"\n WHEN n.action = 4 THEN \"Lock 'n' Go\"\n WHEN n.action = 5 THEN \"Lock 'n' Go + Tür geöffnet\"\n WHEN n.action = 252 THEN \"Initialisiert\"\n WHEN n.action = 253 THEN \"Kalibriert\"\n WHEN n.action = 254 THEN \"Log aktiviert\"\n WHEN n.action = 255 THEN \"Log deaktiviert\"\n ELSE CONCAT(\"[\",n.action,\"] - \", \" Undefiniert\")\n END AS \"Aktion\",\n CASE\n WHEN n.state = 0 THEN \"OK\"\n WHEN n.state = 1 THEN \"Motor blockiert\"\n WHEN n.state = 2 THEN \"Abgebrochen\"\n WHEN n.state = 3 THEN \"Zu neu\"\n WHEN n.state = 4 THEN \"Beschäftigt\"\n WHEN n.state = 5 THEN \"Batterien zu schwach\"\n WHEN n.state = 6 THEN \"Kupplungsfehler\"\n WHEN n.state = 7 THEN \"Motorstromfehler\"\n WHEN n.state = 8 THEN \"Kalibriert\"\n WHEN n.state = 254 THEN \"Anderer Fehler\"\n WHEN n.state = 255 THEN \"Unbekannter Fehler\"\n ELSE CONCAT(\"[\",n.state,\"] - \", \" Undefiniert\")\n END AS \"Status\"\n /*n.trigger AS \"Trigger\" */\n /*n.autoUnlock AS \"Auto-Unlock\" */\n /*n.smartLockId AS \"\" */\n /*n.authId */\n /*n.id */\nFROM \n SmartlockLog AS n, \n Smartlock AS s,\n (SELECT @row_number:=0) AS t\nWHERE s.name = \"$SmartlockName\" \nORDER BY n.date DESC\n;", "refId": "A", - "timeField": "date" + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "timeField": "date", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "title": "Nuki Web Log / Audit", @@ -4500,7 +5644,9 @@ } ], "format": "table", + "group": [], "hide": false, + "metricColumn": "none", "metrics": [ { "field": "select field", @@ -4508,9 +5654,28 @@ "type": "count" } ], + "rawQuery": true, "rawSql": "SELECT\n @row_number:=@row_number + 1 AS \"Nr.\",\n /*n.accountUserId,*/\n n.name AS \"Trigger\",\n n.enabled AS \"Aktiviert\",\n n.remoteAllowed AS \"Remotezugriff\",\n ADDTIME(n.lastActiveDate, SEC_TO_TIME(s.timezoneOffset*60)) AS \"Zuletzt aktiv\", -- +2 Stunden Aufschlag, da Zeitzone anders\n /*ADDTIME(updateDate, SEC_TO_TIME(s.timezoneOffset*60)) AS \"Letztes Update\", -- +2 Stunden Aufschlag, da Zeitzone anders*/\n ADDTIME(n.allowedFromDate, SEC_TO_TIME(s.timezoneOffset*60)) AS \"Erlaubnis von\",\n ADDTIME(n.allowedUntilDate, SEC_TO_TIME(s.timezoneOffset*60)) AS \"Erlaubnis bis\",\n TIME_FORMAT(SEC_TO_TIME(n.allowedFromTime * 60),'%H:%i') AS \"Wiederkehrend: von\",\n TIME_FORMAT(SEC_TO_TIME(n.allowedUntilTime * 60),'%H:%i') AS \"Wiederkehrend: bis\",\n DaysFromBitMask(n.allowedWeekDays) AS \"Erlaubte Wochentage\",\n n.lockCount AS \"Schließzyklen\",\n CASE \n WHEN n.type = 0 THEN \"App\"\n WHEN n.type = 1 THEN \"Bridge\"\n WHEN n.type = 2 THEN \"FOB\"\n WHEN n.type = 3 THEN \"Keypad\"\n WHEN n.type = 13 THEN \"Keypad Code\"\n WHEN n.type = 14 THEN \"Z-Key\"\n WHEN n.type = 15 THEN \"Virtual\"\n ELSE \"Undefiniert\" \n END \"Typ\"\n FROM \n SmartlockAuth AS n, \n Smartlock AS s,\n (SELECT @row_number:=0) AS t\n WHERE\n s.name =\"$SmartlockName\"\n;", "refId": "A", - "timeField": "date" + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "timeField": "date", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "title": "Accounts", @@ -4643,9 +5808,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n l.state\nFROM\n BridgeInfo AS b,\n BridgeLockState AS l\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,3", @@ -4718,9 +5904,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n serverConnected\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,1", @@ -4804,9 +6011,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*range is 0 to -100 while -100 is maximum and 0 is minimum*/\nSELECT \n rssi\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "-75,-50", @@ -4879,9 +6107,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n DATE_FORMAT(ADDTIME(b.currentTime, SEC_TO_TIME(s.timezoneOffset*60)),'%d.%m.%Y %H:%i:%s')\nFROM\n BridgeInfo AS b,\n Smartlock AS s\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -4954,9 +6203,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n /* REPLACE(CAST(FORMAT(CAST(uptime AS DECIMAL) / 60 / 60 / 24, 1) AS CHAR), '.', ',') */\n uptime / 60 / 60 / 24 /*in seconds*/\nFROM\n BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5029,8 +6299,29 @@ { "alias": "", "format": "table", + "group": [], + "metricColumn": "none", + "rawQuery": true, "rawSql": "/*this value is a little bit higher because there are different time offsets due to downloading the log files, maybe syncing them, parsing and importing them */\nSELECT \n (NOW() - ADDTIME(l.timestamp, SEC_TO_TIME(s.timezoneOffset*60)))\nFROM\n BridgeInfo AS b,\n BridgeLog AS l,\n Smartlock AS s\nWHERE b.name = \"$BridgeName\"\n;\n", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "60,90,120", @@ -5100,9 +6391,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n c.id AS \"Id\",\n c.url AS \"URL\"\nFROM\n BridgeInfo AS b,\n BridgeCallbackList AS c\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "title": "Callback URLs", @@ -5173,9 +6485,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n l.success\nFROM\n BridgeInfo AS b,\n BridgeLockState AS l\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,1", @@ -5259,9 +6592,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n paired\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "1,2", @@ -5345,9 +6699,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CASE\n WHEN b.firmwareVersion = \"\" THEN \"n.A.\"\n ELSE b.firmwareVersion\n END\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5420,9 +6795,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CASE \n WHEN b.wifiFirmwareVersion = \"\" THEN \"n.A.\"\n ELSE b.wifiFirmwareVersion\n END\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5496,9 +6892,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n l.batteryCritical\nFROM\n BridgeInfo AS b,\n BridgeLockState AS l\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "0,1", @@ -5582,9 +6999,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n serverId\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5657,9 +7095,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n bridgeType\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5743,9 +7202,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT\n CASE\n WHEN b.hardwareId = \"\" THEN \"n.A.\"\n ELSE b.hardwareId\n END\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5819,9 +7299,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n CASE\n WHEN b.appVersion = \"\" THEN \"n.A.\"\n ELSE b.appVersion\n END\nFROM BridgeInfo AS b\nWHERE b.name = \"$BridgeName\"\n;", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "thresholds": "", @@ -5872,9 +7373,30 @@ { "alias": "", "format": "table", + "group": [], "hide": false, + "metricColumn": "none", + "rawQuery": true, "rawSql": "SELECT \n @row_number:=@row_number + 1 AS \"Nr.\",\n DATE_FORMAT(ADDTIME(l.timestamp, SEC_TO_TIME(s.timezoneOffset*60)),'%d.%m.%Y %H:%i:%s') AS \"Zeitstempel\",\n l.nukiId AS \"Bridge Id\",\n l.cmdId AS \"Command Id\",\n l.connection AS \"Connection\",\n l.macAddr AS \"MAC Adresse\",\n l.type AS \"Typ\"\nFROM\n (SELECT @row_number:=0) AS t,\n BridgeInfo AS b,\n BridgeLog AS l,\n Smartlock AS s\nWHERE b.name = \"$BridgeName\"\n;\n", - "refId": "A" + "refId": "A", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "column" + } + ] + ], + "timeColumn": "time", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] } ], "title": "Bridge Log", @@ -5882,7 +7404,7 @@ "type": "table" } ], - "refresh": false, + "refresh": "30s", "schemaVersion": 16, "style": "dark", "tags": [], @@ -5907,6 +7429,7 @@ "allValue": null, "current": {}, "datasource": "$Datasource", + "definition": "", "hide": 0, "includeAll": false, "label": "Smartlock Name", @@ -5928,6 +7451,7 @@ "allValue": null, "current": {}, "datasource": "$Datasource", + "definition": "", "hide": 0, "includeAll": false, "label": "Smartlock Id", @@ -5949,6 +7473,7 @@ "allValue": null, "current": {}, "datasource": "$Datasource", + "definition": "", "hide": 0, "includeAll": false, "label": "Bridge Name", @@ -5970,6 +7495,7 @@ "allValue": null, "current": {}, "datasource": "$Datasource", + "definition": "", "hide": 0, "includeAll": false, "label": "Bridge Id", @@ -5990,8 +7516,8 @@ ] }, "time": { - "from": "2018-11-30T01:03:32.232Z", - "to": "2018-11-30T13:03:32.232Z" + "from": "now-60d", + "to": "now" }, "timepicker": { "hidden": false, @@ -6022,5 +7548,5 @@ "timezone": "", "title": "Nuki Smartlock + Bridge (Internals)", "uid": "yEqqGFggz", - "version": 175 + "version": 179 } \ No newline at end of file