Merge branch 'sql_exporter' of github.com:keithf4/pgmonitor into sql_…

…exporter
CrunchyData · Apr 16, 2024 · 44b2865 · 44b2865
2 parents 9db159d + 9e27bf7
commit 44b2865
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/hugo/content/grafana/_index.md b/hugo/content/grafana/_index.md
@@ -72,7 +72,7 @@ Review the {{< shell >}}crunchy_grafana_dashboards.yml{{< /shell >}} file to ens
 
 Save all of the desired .json dashboard files to the {{< shell >}}/etc/grafana/crunchy_dashboards{{< /shell >}} folder. All of them are not required, so if there is a dashboard you do not need, it can be left out.
 
-Please note that due to the change to using sql_exporter from postgres_exporter and also being now able to connect directly to pgBouncer to collect its metrics, some dashboards are specific to one exporter or the other. Please use the relevant dashboards accordingly:
+Please note that due to the change from postgres_exporter to sql_exporter, and its ability to connect directly to pgBouncer to collect its metrics, some dashboards are specific to one exporter or the other. Please use the relevant dashboards accordingly:
 
 | Dashboard file                                                            | Use when              |
 |---------------------------------------------------------------------------|-----------------------|

diff --git a/sql_exporter/linux/crunchy-sql-exporter@.service b/sql_exporter/linux/crunchy-sql-exporter@.service
@@ -19,37 +19,6 @@ Restart=on-failure
 #ExecReload=curl http://127.0.0.1:9399/reload
 
 
-#Group=sql_exporter
-#Type=simple
-#WorkingDirectory=/usr/share/sql_exporter
-#RuntimeDirectory=sql_exporter
-#RuntimeDirectoryMode=0750
-#ExecStart=/usr/bin/sql_exporter -config.file=${CONF_FILE} -web.listen-address=${LISTEN_ADDRESS} -log.json=${LOG_JSON} -log.level=${LOG_LEVEL} -web.enable-reload=${ENABLE_RELOAD} -web.metrics-path=${METRICS_PATH} -web.config.file=${WEB_CONFIG_FILE}
-#LimitNOFILE=10000
-#TimeoutStopSec=20
-#CapabilityBoundingSet=
-#DeviceAllow=
-#LockPersonality=true
-#MemoryDenyWriteExecute=false
-#NoNewPrivileges=true
-#PrivateDevices=true
-#PrivateTmp=true
-#ProtectClock=true
-#ProtectControlGroups=true
-#ProtectHome=true
-#ProtectHostname=true
-#ProtectKernelLogs=true
-#ProtectKernelModules=true
-#ProtectKernelTunables=true
-#ProtectProc=invisible
-#ProtectSystem=full
-#RemoveIPC=true
-#RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
-#RestrictNamespaces=true
-#RestrictRealtime=true
-#RestrictSUIDSGID=true
-#SystemCallArchitectures=native
-#UMask=0027
 
 [Install]
 WantedBy=multi-user.target