20171018 dashboard/Makefile.in conf/substitutions.conf.default (Reform von %%PROM_*_PREFIX%% zwecks einfacherer Anwendung)

conf/substitutions.conf.default

@@ -2,18 +2,24 @@ NODES_URL	https://map.ffdo.de/data/nodes.json
 FETCH_CMD	fetch -q -T 30 --no-verify-peer -o
 #FETCH_CMD	wget -O
 PROM_SEPERATOR	_
+#PROM_SEPERATOR	:
 PROM_PREFIX	ffdo_nodes
-SUMMARY_PREFIX	summary
-INFO_PREFIX	info
-STATS_PREFIX	detail
-HEAP_SUFFIX	x86-bsd
+PROM_SUMMARY_PREFIX	ffdo_nodes_summary
+PROM_INFO_PREFIX	ffdo_nodes_info
+PROM_STATS_PREFIX	ffdo_nodes_detail
 EXPORT_DIR	/var/tmp/node_exporter
+HEAP_SUFFIX	x86-bsd
 BIN_DIR		/usr/local/bin
 ETC_DIR		/etc
+DASHBOARD_DIR	/var/db/grafana/dashboards
 INSTALL_BIN_CMD	install -o 0 -g 0 -p -S -v
 #INSTALL_BIN_CMD	cp -a
 INSTALL_DATA_CMD	install -o 0 -g 0 -p -S -v -m 644
 #INSTALL_DATA_CMD	cp -a
-DASHBOARD_DIR	/var/db/grafana/dashboards
 DASHBOARD_PREFIX	FF-DO-
+COMMUNITY_BRIEF	FF-DO
+COMMUNITY_FULL	Freifunk Dortmund
+COMMUNITY_URL	http://www.freifunk-dortmund.de/
 MAP_NODE_URL	https://map.ffdo.de/meshviewer/#!v:m;n:
+N2G_SRC_URL	https://git.ffdo.de/altlast/nodes2grafana
+N2G_COMMUNITY_URL	http://url.free.de/ffdo/Technik/Netzinfrastruktur/Status

src/promconfig.sml.in

@@ -1,8 +1,8 @@
 structure PromConfig =
 struct
 	val seperator = "%%PROM_SEPERATOR%%"
-	val prom_prefix = "%%PROM_PREFIX%%" ^ seperator
-	val summary_prefix = prom_prefix ^ "%%SUMMARY_PREFIX%%"
-	val info_prefix = prom_prefix ^ "%%INFO_PREFIX%%"
-	val stats_prefix = prom_prefix ^ "%%STATS_PREFIX%%" ^ seperator
+	val prom_prefix = "%%PROM_PREFIX%%"
+	val summary_prefix = "%%PROM_SUMMARY_PREFIX%%"
+	val info_prefix = "%%PROM_INFO_PREFIX%%"
+	val stats_prefix = "%%PROM_STATS_PREFIX%%" ^ seperator
 end