Compare commits

..
18 Commits
Author SHA1 Message Date
fauno aa61e17bae fix(alert): invert memory usage alert (#48)
Reviewed-on: #48
Reviewed-by: fauno <fauno@sutty.coop.ar>
2026-10-13 13:55:45 +00:00
fauno 48e8318e41 chore: publish 2.3.0+v1.20.1 release 2026-10-12 13:11:16 -03:00
fauno 298efcfb50 Merge branch 'main' of https://git.coopcloud.tech/coop-cloud/monitoring-ng 2026-10-12 13:10:24 -03:00
fauno 4ab976a0f0 chore(deps): update prometheuscommunity/smartctl-exporter docker tag to v0.15.0 (#46)
Reviewed-on: #46
Reviewed-by: fauno <fauno@sutty.coop.ar>
2026-10-12 16:09:28 +00:00
fauno 8665af7d91 chore(deps): update grafana/grafana docker tag to v13.2.3 (#43)
Reviewed-on: #43
Reviewed-by: fauno <fauno@sutty.coop.ar>
2026-10-12 16:08:11 +00:00
renovate-bot 24927d6331 chore(deps): update grafana/grafana docker tag to v13.2.3 2026-10-12 16:07:57 +00:00
fauno 06521e98cf chore(deps): update grafana/alloy docker tag to v1.20.1 (#42)
Reviewed-on: #42
Reviewed-by: fauno <fauno@sutty.coop.ar>
2026-10-12 16:04:23 +00:00
fauno b322d8fb84 chore(deps): update prom/prometheus docker tag to v3.15.0 (#45)
Reviewed-on: #45
Reviewed-by: fauno <fauno@sutty.coop.ar>
2026-10-12 16:02:08 +00:00
p4u1 01111b992d fix(alert): invert memory usage alert 2026-10-12 13:02:52 +02:00
renovate-bot 0a749fe4fe chore(deps): update prometheuscommunity/smartctl-exporter docker tag to v0.15.0 2026-10-12 03:16:50 +00:00
renovate-bot f980185f8f chore(deps): update prom/prometheus docker tag to v3.15.0 2026-10-12 03:16:46 +00:00
renovate-bot 5028630b04 chore(deps): update grafana/alloy docker tag to v1.20.1 2026-10-12 01:16:59 +00:00
fauno b58e52873a chore: Configure Renovate (#11)
Reviewed-on: #11
2026-10-11 23:39:19 +00:00
fauno 1babe0c7e8 feat: smart monitoring (#25)
it requires a helper script on the host because swarm doesn't support privileged mode

Reviewed-on: #25
Reviewed-by: Danny Groenewegen <247+dannygroenewegen@noreply.git.coopcloud.tech>
Co-authored-by: f <f@sutty.nl>
2026-10-11 23:38:27 +00:00
fauno e0172eaed8 fix: monitoring-ng (#35)
Reviewed-on: #35
Reviewed-by: Danny Groenewegen <247+dannygroenewegen@noreply.git.coopcloud.tech>
Reviewed-by: moritz <98+moritz@noreply.git.coopcloud.tech>
Co-authored-by: f <f@sutty.nl>
2026-10-08 18:42:28 +00:00
fauno e5028c8648 fix: monitoring-ng 2026-10-05 12:46:49 -03:00
fauno 343aa55f75 feat: maintainers closes #33 2026-09-28 15:30:29 -03:00
renovate-bot 60044473cb Add renovate.json 2026-03-10 17:55:43 +00:00
14 changed files with 153 additions and 7 deletions
+3
View File
@@ -58,6 +58,9 @@ SECRET_BASIC_AUTH_VERSION=v1
# COMPOSE_FILE="$COMPOSE_FILE:compose.docker-events.yml"
# Monitor physical disks health
# COMPOSE_FILE="$COMPOSE_FILE:compose.smartctl.yml"
# Monitoring Server
#
## Prometheus
+1
View File
@@ -0,0 +1 @@
* @coop-cloud/monitoring-ng-maintainers
+35
View File
@@ -0,0 +1,35 @@
# Monitoring NG Recipe Maintenance
All contributions should be made via a pull request. This is to ensure a
certain quality and consistency, that others can rely on.
## Maintainer Responsibilities
A recipe maintainer has the following responsibilities:
- Respond to pull requests / issues within two weeks
- Make image security updates within a week
- Make image major updates every three months
In order to fullfill these responsibilities a recipe maintainer:
- Has to watch the repository (to get notifications)
- Needs to make sure renovate is configured properly
## Pull Requests
A pull request can be merged if it is approved by at least one maintainer. For
pull requests opened by a maintainer they need to be approved by another
maintainer. Even though it is okay to merge a pull request with one approval, it
is always better if all maintainers looked at the pull request and approved it.
## Become a maintainer
Everyone can apply to be a recipe maintainer:
1. Watch the repository to always get updates
2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
3. Once the pull request gets merged you will be added to the
[monitoring-ng maintainers
team](https://git.coopcloud.tech/org/coop-cloud/teams/monitoring-ng-maintainers).
4. Join the room
[#cc-|-monitoring-ng-maintenance:matrix.org](#cc-|-monitoring-ng-maintenance:matrix.org) and chat to other maintainers.
+9 -1
View File
@@ -7,7 +7,7 @@ It's based heavily on the [monitoring-lite](https://git.coopcloud.tech/coop-clou
Metrics and logs are collected by [Grafana Alloy](https://grafana.com/docs/alloy/latest/) and pushed to a central Prometheus/Loki (via `remote_write`/`loki push`). Every `monitoring-ng` instance runs its own Alloy, whether or not it also runs the central stack.
<!-- metadata -->
- **Maintainer**: [@coop-cloud/monitoring-ng-maintainers](https://git.coopcloud.tech/org/coop-cloud/teams/monitoring-ng-maintainers)
- **Category**: Apps
- **Status**: 2, beta
- **Image**: [`grafana/grafana`](https://hub.docker.com/r/grafana/grafana), 4, upstream
@@ -174,3 +174,11 @@ It is possible to enable the following alerts, by uncommenting the corresponding
- node disk space: `ALERT_NODE_DISK_SPACE_LEFT`
- node memory usage: `ALERT_NODE_MEMORY_USAGE`
## smart monitoring
To be able monitor hard drive health data, you need to configure
`smartd` to run on the host system, and also the
`collect-smartctl-json.sh` script provided here (via cronjob or as
a `smartd` hook). This is a limitation on Docker Swarm, which prevents
the `smartctl_exporter` from running on privileged mode.
+1 -1
View File
@@ -9,7 +9,7 @@ export LOKI_YML_VERSION=v3
export PROMETHEUS_YML_VERSION=v2
export MATRIX_ALERTMANAGER_CONFIG_VERSION=v1
export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1
export GF_ALERTS_NODE_VERSION=v3
export GF_ALERTS_NODE_VERSION=v4
export CONFIG_ALLOY_VERSION=v3
# migrates secrets from old names to new names by reading values from the
+1 -1
View File
@@ -87,7 +87,7 @@ groups:
datasourceUid: PBFA97CFB590B2093
model:
editorMode: code
expr: (node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100
expr: 100 - ((node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100)
instant: true
intervalMs: 1000
legendFormat: __auto
+6
View File
@@ -0,0 +1,6 @@
[Unit]
Description=Collect SMART data
[Service]
Type=oneshot
ExecStart=/usr/local/bin/collect-smartctl-json.sh
+61
View File
@@ -0,0 +1,61 @@
#! /bin/bash
# Adapted from https://github.com/prometheus-community/smartctl_exporter/blob/master/collect-smartctl-json.sh
# Data directory to dump smartctl output
# This directory will be created if it doesn't exist
data_dir="/var/lib/smartmontools/json"
# The original script used --xall but that doesn't work
# This matches the command in readSMARTctl()
smartctl_args="--json --info --health --attributes --tolerance=verypermissive \
--nocheck=standby --format=brief --log=error"
# Ignore this devices
smartctl_ignore_dev_regex="^(/dev/bus)"
# Determine the json query tool to use
if command -v jq >/dev/null; then
json_tool="jq"
json_args="--raw-output"
elif command -v yq >/dev/null; then
json_tool="yq"
json_args="--unwrapScalar"
else
echo -e "One of 'yq' or 'jq' is required. Please try again after \
installing one of them"
exit 1
fi
if [[ ! "${UID}" -eq 0 ]] && ! command -v sudo >/dev/null; then
# Not root and sudo doesn't exist
echo "sudo does not exist. Please run this as root"
exit 1
fi
SUDO="sudo"
if [[ "${UID}" -eq 0 ]]; then
# Don't use sudo if root
SUDO=""
fi
[[ ! -d "${data_dir}" ]] && mkdir --parents "${data_dir}"
if [[ $# -ne 0 ]]; then
devices="${1}"
else
devices="$(smartctl --scan --json | "${json_tool}" "${json_args}" \
".devices[].name | select(test(\"${smartctl_ignore_dev_regex}\") | not)")"
mapfile -t devices <<< "${devices[@]}"
fi
for device in "${devices[@]}"
do
echo -n "Collecting data for '${device}'..."
# shellcheck disable=SC2086
data="$($SUDO smartctl ${smartctl_args} ${device})"
# Accommodate a smartmontools pre-7.3 bug
data=${data#" Pending defect count:"}
device_name="$(basename "${device}")"
echo -e "\tSaving to ${device_name}.json"
echo "${data}" > "${data_dir}/${device_name}.json"
done
+9
View File
@@ -0,0 +1,9 @@
[Unit]
Description=Collect SMART data
[Timer]
OnCalendar=hourly
Persistent=true
[Install]
WantedBy=timers.target
+1 -1
View File
@@ -2,7 +2,7 @@ version: '3.8'
services:
grafana:
image: grafana/grafana:13.0.6
image: grafana/grafana:13.2.3
volumes:
- grafana-data:/var/lib/grafana:rw
secrets:
+1 -1
View File
@@ -2,7 +2,7 @@ version: '3.8'
services:
prometheus:
image: prom/prometheus:v3.12.0
image: prom/prometheus:v3.15.0
secrets:
- basic_auth
volumes:
+17
View File
@@ -0,0 +1,17 @@
---
version: "3.8"
services:
smartctl:
image: "prometheuscommunity/smartctl-exporter:v0.15.0"
volumes:
- "/var/lib/smartmontools/json:/debug"
command:
- "--smartctl.fake-data"
- "--smartctl.interval=1h"
networks:
- "proxy"
deploy:
labels:
- "prometheus.io/scrape=true"
- "prometheus.io/port=9633"
- "prometheus.io/path=/metrics"
+2 -2
View File
@@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: grafana/alloy:v1.18.1
image: grafana/alloy:v1.20.1
hostname: "${DOMAIN}"
configs:
- source: config_alloy
@@ -53,7 +53,7 @@ services:
condition: on-failure
labels:
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
- "coop-cloud.${STACK_NAME}.version=2.2.0+v1.18.1"
- "coop-cloud.${STACK_NAME}.version=2.3.0+v1.20.1"
configs:
config_alloy:
template_driver: golang
+6
View File
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}