Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: improve launch script #63

Merged
merged 2 commits into from
Dec 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions server/docker/grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,35 @@ services:
limits:
cpus: '0.5'

node-exporter:
image: quay.io/prometheus/node-exporter:latest
container_name: node_exporter
command:
- '--path.rootfs=/host'
network_mode: host
pid: host
restart: unless-stopped
volumes:
- '/:/host:ro,rslave'
deploy:
resources:
limits:
cpus: '0.5'

process-exporter:
ports:
- "9256:9256"
privileged: true
volumes:
- /proc:/host/proc
- "./config:/config"
image: ncabatoff/process-exporter
command: --procfs /host/proc -config.path /config/process-exporter.yaml
deploy:
resources:
limits:
cpus: '0.5'

prometheus:
image: prom/prometheus:v2.24.0
ports:
Expand Down
8 changes: 4 additions & 4 deletions server/scripts/auto-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ download_latest () {

newest_hash=$(sha256sum "$BINARY_PATH" | gawk '{print $1}')

echo "$INFO* Downloaded latest release binary!$RESET"
echo "$INFO* Downloaded latest release binary$RESET"
}

build () {
Expand All @@ -83,9 +83,9 @@ update () {
git reset --hard > /dev/null || exit 1

# This way we only pull the main branch
git fetch origin main || exit 1
git switch main || exit 1
git pull || exit 1
git fetch origin main > /dev/null || exit 1
git switch main > /dev/null || exit 1
git pull > /dev/null || exit 1

cd server/ || exit 1

Expand Down
3 changes: 0 additions & 3 deletions server/scripts/launch-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ printf "$START* Running at $(date)$RESET\n"

GRAFANA_COMPOSE_OVERRIDE=${GRAFANA_COMPOSE_OVERRIDE:-base}

echo
server/scripts/run-exporters.sh

# Start Grafana stack

printf "${SECTION}* Launching Grafana stack...$RESET\n\n"
Expand Down
25 changes: 0 additions & 25 deletions server/scripts/run-exporters.sh

This file was deleted.