Skip to content

Commit 82f595a

Browse files
committed
Safer creation of Grafana service and example of postgresql as config host for Grafana on Windows. Release notes: change on formatting.
1 parent 83ccbd3 commit 82f595a

File tree

2 files changed

+42
-40
lines changed

2 files changed

+42
-40
lines changed

platform-windows/create_services.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ nssm set JSON_SCADA_postgresql Start SERVICE_AUTO_START
1313

1414
nssm install JSON_SCADA_grafana "C:\json-scada\platform-windows\grafana-runtime\bin\grafana-server.exe"
1515
nssm set JSON_SCADA_grafana AppDirectory "C:\json-scada\platform-windows\grafana-runtime\bin"
16-
nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_SERVER_DOMAIN=127.0.0.1 GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:80/grafana/ GF_SERVER_SERVE_FROM_SUB_PATH=true GF_AUTH_PROXY_ENABLED=true GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN=true GF_AUTH_DISABLE_SIGNOUT_MENU=true
16+
nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_SERVER_DOMAIN="127.0.0.1" GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:80/grafana/" GF_SERVER_SERVE_FROM_SUB_PATH="true" GF_AUTH_PROXY_ENABLED="true" GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN="true" GF_AUTH_DISABLE_SIGNOUT_MENU="true"
17+
rem example of using postgresql to host grafana config (necessary for multiple web servers):
18+
rem nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_DATABASE_TYPE="postgres" GF_DATABASE_HOST="127.0.0.1" GF_DATABASE_USER="postgres" GF_SERVER_DOMAIN="127.0.0.1" GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:80/grafana/" GF_SERVER_SERVE_FROM_SUB_PATH="true" GF_AUTH_PROXY_ENABLED="true" GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN="true" GF_AUTH_DISABLE_SIGNOUT_MENU="true"
1719
REM nssm set JSON_SCADA_grafana AppStdout "C:\json-scada\log\grafana-stdout.log"
1820
REM nssm set JSON_SCADA_grafana AppStderr "C:\json-scada\log\grafana-stderr.log"
1921
nssm set JSON_SCADA_grafana Start SERVICE_AUTO_START

platform-windows/release_notes.txt

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{json:scada}
22

3-
© 2008-2022* Ricardo L. Olsen
3+
© 2008-2022 Ricardo L. Olsen
44
(https://www.linkedin.com/in/ricardo-olsen/)
55

66
This program is free software: you can redistribute it and/or modify
@@ -20,45 +20,45 @@ The system will install to "c:\json-scada\" (on Windows).
2020

2121
Acknowledgements:
2222

23-
MongoDB* https://github.com/mongodb/mongo, https://www.mongodb.com/
24-
PostgreSQL* https://www.postgresql.org/
25-
TimescaleDB* https://github.com/timescale/timescaledb, https://www.timescale.com/
26-
Grafana* https://github.com/grafana/grafana, https://grafana.com/
27-
Lib60870 By MZ Automation* https://github.com/mz-automation/lib60870, https://www.mz-automation.de/
28-
ICCP Client by Fernando Covatti* https://github.com/fcovatti/iccp
29-
Opendnp3* https://github.com/dnp3/opendnp3
30-
PLC4X* https://github.com/apache/plc4x
31-
Libplctag* https://github.com/libplctag/libplctag
32-
Node-opcua* https://github.com/node-opcua/node-opcua
33-
OPC-UA* https://github.com/OPCFoundation/UA-.NETStandard
34-
Telegraf* https://github.com/influxdata/telegraf
35-
Inkscape* https://inkscape.org
36-
Inkscape + SAGE* https://sourceforge.net/projects/sage-scada
37-
Inkscape + SAGE (updated)* https://gitlab.com/lvta0909/inkscape
38-
Chromium* by "The Chromium Authors"
39-
Chromium x86 binaries* http://chromium.woolyss.com/
40-
NGINX* http://nginx.org/
41-
Node.js* https://nodejs.org/
42-
Express* https://expressjs.com/pt-br/
43-
Dotnet* https://dotnet.microsoft.com/download
44-
Golang* https://golang.org/
23+
MongoDB - https://github.com/mongodb/mongo, https://www.mongodb.com/
24+
PostgreSQL - https://www.postgresql.org/
25+
TimescaleDB - https://github.com/timescale/timescaledb, https://www.timescale.com/
26+
Grafana - https://github.com/grafana/grafana, https://grafana.com/
27+
Lib60870 By MZ Automation - https://github.com/mz-automation/lib60870, https://www.mz-automation.de/
28+
ICCP Client by Fernando Covatti - https://github.com/fcovatti/iccp
29+
Opendnp3 - https://github.com/dnp3/opendnp3
30+
PLC4X - https://github.com/apache/plc4x
31+
Libplctag - https://github.com/libplctag/libplctag
32+
Node-opcua - https://github.com/node-opcua/node-opcua
33+
OPC-UA - https://github.com/OPCFoundation/UA-.NETStandard
34+
Telegraf - https://github.com/influxdata/telegraf
35+
Inkscape - https://inkscape.org
36+
Inkscape + SAGE - https://sourceforge.net/projects/sage-scada
37+
Inkscape + SAGE (updated) - https://gitlab.com/lvta0909/inkscape
38+
Chromium by "The Chromium Authors"
39+
Chromium x86 binaries - http://chromium.woolyss.com/
40+
NGINX - http://nginx.org/
41+
Node.js - https://nodejs.org/
42+
Express - https://expressjs.com/pt-br/
43+
Dotnet - https://dotnet.microsoft.com/download
44+
Golang - https://golang.org/
4545
Open Sans Fonts by Steve Matteson
46-
Source Sans Pro by Adobe Systems Incorporated. License* http://scripts.sil.org/OFL
47-
Google Fonts* https://fonts.google.com/
48-
JQuery* http://jquery.com
49-
Shortcut* http://www.openjs.com/scripts/events/keyboard_shortcuts
50-
Core JS* http://www.sitepoint.com
51-
Modernzr* http://www.modernizr.com
52-
Flot* http://www.flotcharts.org
53-
Snap SVG* http://snapsvg.io
54-
Chroma.js* https://github.com/gka/chroma.js
55-
CSS Animation Cheat Sheet* http://www.justinaguilar.com/animations
56-
D3JS* http://d3js.org
57-
Radar-chart-d3* https://github.com/alangrafu/radar-chart-d3
58-
Vega A Visualization Grammar* https://vega.github.io/vega
59-
NSSM* The Non-Sucking Service Manager: http://nssm.cc
60-
Some icons from* http://keyamoon.com/icomoon and http://raphaeljs.com/icons
61-
CSS Loaders from Luke Haas* https://projects.lukehaas.me/css-loaders/
46+
Source Sans Pro by Adobe Systems Incorporated. License - http://scripts.sil.org/OFL
47+
Google Fonts - https://fonts.google.com/
48+
JQuery - http://jquery.com
49+
Shortcut - http://www.openjs.com/scripts/events/keyboard_shortcuts
50+
Core JS - http://www.sitepoint.com
51+
Modernzr - http://www.modernizr.com
52+
Flot - http://www.flotcharts.org
53+
Snap SVG - http://snapsvg.io
54+
Chroma.js - https://github.com/gka/chroma.js
55+
CSS Animation Cheat Sheet - http://www.justinaguilar.com/animations
56+
D3JS - http://d3js.org
57+
Radar-chart-d3 - https://github.com/alangrafu/radar-chart-d3
58+
Vega A Visualization Grammar - https://vega.github.io/vega
59+
NSSM - The Non-Sucking Service Manager: http://nssm.cc
60+
Some icons from - http://keyamoon.com/icomoon and http://raphaeljs.com/icons
61+
CSS Loaders from Luke Haas - https://projects.lukehaas.me/css-loaders/
6262

6363
-------------------------------------------------------------------
6464

0 commit comments

Comments
 (0)