Meshviewer: Use complete node name for grafana link

meshviewer/files/config.json.j2

@@ -34,31 +34,31 @@
   "nodeInfos": [
     {
       "name": "Clientstatistik",
-      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
+      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_CUSTOM}&from=now-7d&to=now-1m",
       "image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=7&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
       "title": "Knoten {NODE_ID} ({NODE_NAME})"
     },
     {
       "name": "Traffic",
-      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
+      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_CUSTOM}&from=now-7d&to=now-1m",
       "image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=1&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
       "title": "Knoten {NODE_ID} ({NODE_NAME})"
     },
     {
       "name": "Uptime",
-      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
+      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_CUSTOM}&from=now-7d&to=now-1m",
       "image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=5&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
       "title": "Knoten {NODE_ID} ({NODE_NAME})"
     },
     {
       "name": "CPU Auslastung",
-      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
+      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_CUSTOM}&from=now-7d&to=now-1m",
       "image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=2&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
       "title": "Knoten {NODE_ID} ({NODE_NAME})"
     },
     {
       "name": "Neighbours",
-      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
+      "href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_CUSTOM}&from=now-7d&to=now-1m",
       "image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=4&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
       "title": "Knoten {NODE_ID} ({NODE_NAME})"
     }
@@ -71,6 +71,7 @@
       "title": "Bild der Wochenstatistik"
     }
   ],
+  "node_custom": "/[<>\"']/ig",
   "deprecation_enabled": true,
   "deprecation_text": "Warnung: Dieser Knoten ist veraltet und wird seit dem 30. September 2020 nicht mehr unterstützt. Mehr Infos unter <a href='https://supportende.ffm.freifunk.net/'>supportende.ffm.freifunk.net</a>. Wenn du der Eigentümer des Gerätes bist, bitten wir dich, das Gerät dringend zu ersetzen, um weiterhin am Netz teilnehmen zu können."
 }

meshviewer/init.sls

@@ -3,10 +3,10 @@
 meshviewer:
   archive.extracted:
     - name: /srv/www/{{ map_domain }}/htdocs/
-    - source: https://github.com/freifunk-ffm/meshviewer/releases/download/v12.2.0/meshviewer-build.zip
+    - source: https://github.com/freifunk-ffm/meshviewer/releases/download/v12.2.1/meshviewer-build.zip
     - user: www-data
     - group: www-data
-    - source_hash: sha256=1c22a05c53c19fcfbecf540e2e9193b040693a71a3937143e9b87c76431c7cd4
+    - source_hash: sha256=d5994514b37be9be62e75d4c19ecea0e9ae95578bae1a8f790c04a8ad0f55999
     - source_hash_update: true
     - keep_source: false
     - clean: true