Skip to content

Commit

Permalink
feat(#112): update default service versions (#113)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuester authored Sep 18, 2024
1 parent 0d12c6d commit e1acda3
Show file tree
Hide file tree
Showing 10 changed files with 4,199 additions and 6,147 deletions.
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GRAFANA_ADMIN_USER=medic
GRAFANA_ADMIN_PASSWORD=password
GRAFANA_VERSION=latest
#GRAFANA_VERSION=latest
GRAFANA_PORT=3000
# Use 0.0.0.0 to expose to LAN/Internet, use 127.0.0.1 to
# use with reverse proxy (Caddy, Traefik etc)
Expand All @@ -10,14 +10,14 @@ GRAFANA_DATA="./grafana/data"
# Comma separated list of plugins to install
GRAFANA_PLUGINS=grafana-discourse-datasource

JSON_EXPORTER_VERSION=latest
#JSON_EXPORTER_VERSION=latest

PROMETHEUS_VERSION=latest
#PROMETHEUS_VERSION=latest
# Note: Relative paths do not work with docker-compose v2.x. In that case, simply use an absolute path.
PROMETHEUS_DATA="./prometheus/data"
PROMETHEUS_RETENTION_TIME=60d


#SQL_EXPORTER_VERSION=latest
# Use 0.0.0.0 to expose to LAN/Internet, use 127.0.0.1 to
# use with reverse proxy (Caddy, Traefik etc)
SQL_EXPORTER_IP=127.0.0.1
Expand Down
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
day: "saturday"
commit-message:
prefix: "chore"
groups:
commitlint:
patterns:
- "@commitlint/*"
2 changes: 1 addition & 1 deletion .github/workflows/conventional-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 22.x
- name: Install dependencies
run: npm ci
- name: Lint title
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ name: Integration tests

on: [push, pull_request]

env:
NODE_VERSION: 18.x

jobs:
build:
name: Tests for Node version ${{ matrix.node-version }}
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [ 20.x, 22.x ]
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js ${{ env.NODE_VERSION }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm ci
- name: Run test suite
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 22.x
- name: Install dependencies
run: npm ci
- name: Release
Expand Down
3 changes: 0 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ volumes:

services:
prometheus:
image: prom/prometheus:${PROMETHEUS_VERSION:-v2.46.0}
image: prom/prometheus:${PROMETHEUS_VERSION:-v2.54.1}
ports:
- "${PROMETHEUS_BIND:-127.0.0.1}:${PROMETHEUS_PORT:-9090}:9090"
command:
Expand All @@ -34,7 +34,7 @@ services:
restart: always

grafana:
image: grafana/grafana-oss:${GRAFANA_VERSION:-10.0.3}
image: grafana/grafana-oss:${GRAFANA_VERSION:-11.2.0}
ports:
- "${GRAFANA_BIND:-127.0.0.1}:${GRAFANA_PORT:-3000}:3000"
volumes:
Expand Down
3 changes: 1 addition & 2 deletions exporters/postgres/compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
services:

# todo: uncomment and get this working
prometheus:
volumes:
- ./exporters/postgres/scrape.yml:/etc/prometheus/scrape_configs/cht-postgres.yml:ro

sql_exporter:
restart: unless-stopped
image: burningalchemist/sql_exporter:latest
image: burningalchemist/sql_exporter:${SQL_EXPORTER_VERSION:-0.15}
command: --config.file=/etc/sql_exporter/sql_servers.yml
volumes:
- "./exporters/postgres/:/etc/sql_exporter/"
Expand Down
Loading

0 comments on commit e1acda3

Please sign in to comment.