Update manifests and mavlogd for grafana v7+ #1015

goodrobots · Sep 26, 2021 · 43efa22 · 43efa22
1 parent 4306341
commit 43efa22
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 39 deletions.
diff --git a/manifests/maverick-modules/maverick_analysis/files/grafana-dashboards.yaml b/manifests/maverick-modules/maverick_analysis/files/grafana-dashboards.yaml
@@ -2,10 +2,14 @@ apiVersion: 1
 
 providers:
 - name: 'dashboards'
-  orgId: 1
+  orgId: 10
   folder: ''
+  folderUid: 'iceman'
   type: file
   disableDeletion: false
+  updateIntervalSeconds: 10
+  allowUiUpdates: false
   editable: false
   options:
-    path: /srv/maverick/data/analysis/grafana/dashboards
+    path: /srv/maverick/data/analysis/grafana/dashboards
+    foldersFromFilesStructure: false
diff --git a/manifests/maverick-modules/maverick_analysis/files/grafana-influx.yaml b/manifests/maverick-modules/maverick_analysis/files/grafana-influx.yaml
@@ -4,7 +4,7 @@ datasources:
   - name: influxdb
     type: influxdb
     access: proxy
-    orgId: 1
+    orgId: 10
     url: http://localhost:6020
     database: maverick
     isDefault: true
diff --git a/manifests/maverick-modules/maverick_analysis/files/maverick-mavlogd b/manifests/maverick-modules/maverick_analysis/files/maverick-mavlogd
@@ -318,20 +318,20 @@ class ProcessLog(ProcessEvent):
                         link += "<td>"+datetime.datetime.fromtimestamp(float(row[1])).strftime('%Y-%m-%d %H:%M:%S')+"</td>"
                         link += "<td>"+datetime.datetime.fromtimestamp(float(row[2])).strftime('%Y-%m-%d %H:%M:%S')+"</td>"
                         link += "<td>"
-                        link += "<a href='/analysis/grafana/dashboard/db/flight-data-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(117, 117, 117); border-color: rgb(155, 155, 155); color: #fff;\">Flight Data</a>"
+                        link += "<a href='/analysis/grafana/d/flight-dashboard-ardupilot/flight-data-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(117, 117, 117); border-color: rgb(155, 155, 155); color: #fff;\">Flight Data</a>"
                         link += "&nbsp;"
-                        link += "<a href='/analysis/grafana/dashboard/db/mavexplorer-mavgraphs?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' background-color: rgb(31, 120, 193); border-color: rgb(69, 158, 231); color: #fff;\">Mavgraphs</a>"
+                        link += "<a href='/analysis/grafana/d/mavexplorer-mavgraphs/mavexplorer-mavgraphs?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' background-color: rgb(31, 120, 193); border-color: rgb(69, 158, 231); color: #fff;\">Mavgraphs</a>"
                         link += "</td>"
                         if row[4] == 1:
-                            link += "<td><a href='/analysis/grafana/dashboard/db/flight-ekf2-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(88, 68, 119); border-color: rgb(126, 106, 157); color: #fff;\">EKF2</a></td>"
+                            link += "<td><a href='/analysis/grafana/d/flight-ekf2-ardupilot/flight-ekf2-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(88, 68, 119); border-color: rgb(126, 106, 157); color: #fff;\">EKF2</a></td>"
                         else:
                             link += "<td></td>"
                         if row[5] == 1:
-                            link += "<td><a href='/analysis/grafana/dashboard/db/flight-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(98, 158, 81); border-color: rgb(136, 196, 119); color: #fff;\">EKF3</a></td>"
+                            link += "<td><a href='/analysis/grafana/d/flight-ekf3-ardupilot/flight-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(98, 158, 81); border-color: rgb(136, 196, 119); color: #fff;\">EKF3</a></td>"
                         else:
                             link += "<td></td>"
                         if row[6] == 1:
-                            link += "<td><a href='/analysis/grafana/dashboard/db/flight-ekf2-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"color: #fff\">EKF2-EKF3</a></td>"
+                            link += "<td><a href='/analysis/grafana/d/flight-ekf2ekf3-ardupilot/flight-ekf2-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"color: #fff\">EKF2-EKF3</a></td>"
                         else:
                             link += "<td></td>"
                         try:
@@ -377,7 +377,8 @@ class ProcessLog(ProcessEvent):
             "tags": ["ardupilot"],
             "timezone": "browser",
             "version": int(time.time()),
-            "title": "Flight Logs Index"
+            "title": "Flight Logs Index",
+            "uid": "flight-index"
         }
         # Create/update the dashboard in grafana
         #grafana = GrafanaClient((self.app.config['grafana_user'], self.app.config['grafana_password']), host=self.app.config['grafana_host'], port=self.app.config['grafana_port'])
@@ -398,13 +399,13 @@ class ProcessLog(ProcessEvent):
                     todt=str(int(error['time']) + 30000)
                     link = "<tr><td>"+error['text']+"</td><td>"+datetime.datetime.fromtimestamp(int(error['time'])/1000).strftime('%Y-%m-%d %H:%M:%S')+"</td>"
                     link += "<td>"
-                    link += "<a href='/analysis/grafana/dashboard/db/flight-data-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(117, 117, 117); border-color: rgb(155, 155, 155); color: #fff;\">Flight Data</a>"
+                    link += "<a href='/analysis/grafana/d/flight-dashboard-ardupilot/flight-data-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(117, 117, 117); border-color: rgb(155, 155, 155); color: #fff;\">Flight Data</a>"
                     link += "&nbsp;"
-                    link += "<a href='/analysis/grafana/dashboard/db/mavexplorer-mavgraphs?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' background-color: rgb(31, 120, 193); border-color: rgb(69, 158, 231); color: #fff;\">Mavgraphs</a>"
+                    link += "<a href='/analysis/grafana/d/mavexplorer-mavgraphs/mavexplorer-mavgraphs?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' background-color: rgb(31, 120, 193); border-color: rgb(69, 158, 231); color: #fff;\">Mavgraphs</a>"
                     link += "</td>"
-                    link += "<td><a href='/analysis/grafana/dashboard/db/flight-ekf2-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(88, 68, 119); border-color: rgb(126, 106, 157); color: #fff;\">EKF2</a></td>"
-                    link += "<td><a href='/analysis/grafana/dashboard/db/flight-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(98, 158, 81); border-color: rgb(136, 196, 119); color: #fff;\">EKF3</a></td>"
-                    link += "<td><a href='/analysis/grafana/dashboard/db/flight-ekf2-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"color: #fff\">EKF2-EKF3</a></td>"
+                    link += "<td><a href='/analysis/grafana/d/flight-ekf2-ardupilot/flight-ekf2-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(88, 68, 119); border-color: rgb(126, 106, 157); color: #fff;\">EKF2</a></td>"
+                    link += "<td><a href='/analysis/grafana/d/flight-ekf3-ardupilot/flight-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"background-color: rgb(98, 158, 81); border-color: rgb(136, 196, 119); color: #fff;\">EKF3</a></td>"
+                    link += "<td><a href='/analysis/grafana/d/flight-ekf2ekf3-ardupilot/flight-ekf2-ekf3-analysis?orgId=10&from="+fromdt+"&to="+todt+"' class='label label-tag' style=\"color: #fff\">EKF2-EKF3</a></td>"
                     link += "</tr>"
                     error_entries.append(link)
                 # If dates are in old format, skip entry
@@ -431,7 +432,8 @@ class ProcessLog(ProcessEvent):
             "tags": ["ardupilot"],
             "timezone": "browser",
             "version": int(time.time()),
-            "title": "Flight Errors Index"
+            "title": "Flight Errors Index",
+            "uid": "flighterrors-index"
         }
         # Create/update the dashboard in grafana
         #grafana = GrafanaClient((self.app.config['grafana_user'], self.app.config['grafana_password']), host=self.app.config['grafana_host'], port=self.app.config['grafana_port'])

diff --git a/manifests/maverick-modules/maverick_analysis/manifests/grafana.pp b/manifests/maverick-modules/maverick_analysis/manifests/grafana.pp
@@ -112,7 +112,7 @@
             source      => "puppet:///modules/maverick_analysis/grafana.service",
             notify      => Exec["maverick-systemctl-daemon-reload"],
         } ->
-        class { "::grafana": 
+        class { "::grafana":
             cfg_location        => "/srv/maverick/config/analysis/grafana.ini",
             cfg => {
                 app_mode => 'production',
@@ -138,28 +138,20 @@
             version               => $grafana_version,
             notify                => Service[grafana-server],
         } ->
-        /*
-        exec { "grafana-hold-package":
-            command     => "/usr/bin/apt-mark hold grafana",
-            unless      => "/usr/bin/apt-mark showhold grafana",
-        } ->
-        */
         service { "grafana":
             ensure      => "stopped",
             enable      => false,
         } ->
         service { "grafana-server":
             ensure      => "stopped",
             enable      => false,
-        }
+        } ->
         # Create maverick org in grafana
-        /*
         exec { "grafana-maverickorg":
             unless          => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db 'select * from main.org' |grep Maverick",
             command         => "/bin/sleep 10; /usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db \"insert into main.org values(10,0,'Maverick','','','','','','','','2017-06-20 11:02:55','2017-06-20 11:15:51')\"", # sleep is to give grafana enough time to fire up and release the db
             user            => "mav",
         } ->
-        */
         # Delete old mav user
         exec { "grafana-deloldmavuser":
             onlyif          => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db 'select * from main.user where id=10' |grep mav",
@@ -172,10 +164,16 @@
             command         => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db \"insert into main.user values(100,0,'mav','mav','Maverick User','${mav_password}','${mav_salt}','yICOZzT82L','',10,0,0,'','2017-06-21 12:54:43','2017-06-21 12:54:43',1,'2017-06-21 12:54:43', 0)\"",
             user            => "mav",
         } ->
+        # Delete old mav user link
+        exec { "grafana-deloldmavuserlink":
+            onlyif          => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db 'select * from main.org_user where id=100 and org_id=1' |grep Viewer",
+            command         => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db \"delete from main.org_user where id=100\"",
+            user            => "mav",
+        } ->
         # Link mav user to org
         exec { "grafana-linkmav":
-            unless          => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db 'select * from main.org_user where org_id=\"1\" and user_id=\"100\"' |grep Viewer",
-            command         => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db \"insert into main.org_user values('100','1','100','Viewer','2017-06-21 13:43:38','2017-06-21 13:43:38')\"",
+            unless          => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db 'select * from main.org_user where org_id=\"10\" and user_id=\"100\"' |grep Viewer",
+            command         => "/usr/bin/sqlite3 /srv/maverick/data/analysis/grafana/grafana.db \"insert into main.org_user values('100','10','100','Viewer','2017-06-21 13:43:38','2017-06-21 13:43:38')\"",
             user            => "mav",
         }
 
@@ -225,13 +223,15 @@
             group           => "mav",
         }
 
-        /*
         ### NEW - Not working yet
+        /*
         exec { "grafana-reset-admin-password":
-            command         => "/usr/sbin/grafana-cli -d admin reset-admin-password ${admin_password} --config=/srv/maverick/config/analysis/grafana.ini",
+            command         => "/usr/sbin/grafana-cli admin reset-admin-password ${admin_password} --config=/srv/maverick/config/analysis/grafana.ini",
             #unless          => "",
             cwd             => "/usr/share/grafana",
-        } ->
+        }
+        */
+        /*
         grafana_organization { 'maverick':
             grafana_url      => "http://${host}:${port}",
             grafana_user     => $admin_user,

diff --git a/manifests/maverick-modules/maverick_analysis/templates/flight-dashboard-ardupilot.json b/manifests/maverick-modules/maverick_analysis/templates/flight-dashboard-ardupilot.json
@@ -8863,5 +8863,6 @@
   },
   "timezone": "browser",
   "title": "Flight Data Analysis",
-  "version": 6
+  "version": 7,
+  "uid": "flight-dashboard-ardupilot"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/flight-ekf2-ardupilot.json b/manifests/maverick-modules/maverick_analysis/templates/flight-ekf2-ardupilot.json
@@ -5791,5 +5791,6 @@
   },
   "timezone": "browser",
   "title": "Flight EKF2 Analysis",
-  "version": 13
+  "version": 14,
+  "uid": "flight-ekf2-ardupilot"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/flight-ekf2ekf3-ardupilot.json b/manifests/maverick-modules/maverick_analysis/templates/flight-ekf2ekf3-ardupilot.json
@@ -6576,5 +6576,6 @@
   },
   "timezone": "browser",
   "title": "Flight EKF2-EKF3 Analysis",
-  "version": 16
+  "version": 17,
+  "uid": "flight-ekf2ekf3-ardupilot"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/flight-ekf3-ardupilot.json b/manifests/maverick-modules/maverick_analysis/templates/flight-ekf3-ardupilot.json
@@ -5765,5 +5765,6 @@
   },
   "timezone": "browser",
   "title": "Flight EKF3 Analysis",
-  "version": 11
+  "version": 12,
+  "uid": "flight-ekf3-ardupilot"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/mavexplorer-mavgraphs.json b/manifests/maverick-modules/maverick_analysis/templates/mavexplorer-mavgraphs.json
@@ -4425,5 +4425,6 @@
   },
   "timezone": "browser",
   "title": "MAVExplorer Mavgraphs",
-  "version": 7
+  "version": 8,
+  "uid": "mavexplorer-mavgraphs"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/system-dashboard-generic.json b/manifests/maverick-modules/maverick_analysis/templates/system-dashboard-generic.json
@@ -5290,5 +5290,6 @@
   },
   "timezone": "browser",
   "title": "System Dashboard",
-  "version": 10
+  "version": 11,
+  "uid": "system-dashboard"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/system-dashboard-joule.json b/manifests/maverick-modules/maverick_analysis/templates/system-dashboard-joule.json
@@ -4823,5 +4823,6 @@
   },
   "timezone": "browser",
   "title": "System Dashboard",
-  "version": 10
+  "version": 11,
+  "uid": "system-dashboard"
 }
diff --git a/manifests/maverick-modules/maverick_analysis/templates/system-dashboard-raspberry.json b/manifests/maverick-modules/maverick_analysis/templates/system-dashboard-raspberry.json
@@ -4823,5 +4823,6 @@
   },
   "timezone": "browser",
   "title": "System Dashboard",
-  "version": 10
+  "version": 11,
+  "uid": "system-dashboard"
 }
diff --git a/manifests/maverick-modules/maverick_web/manifests/maverick_docs.pp b/manifests/maverick-modules/maverick_web/manifests/maverick_docs.pp
@@ -7,7 +7,7 @@
 #
 # @param server_hostname
 #   Specifies which webserver vhost to use for the documentation.  Should not be set in normal circumstances.
-# @param arudpilot_docs
+# @param ardupilot_docs
 #   If true, compile and install the Ardupilot reference documentation.
 # @param ardupilot_builddir
 #   Path to clone github repo and build docs