Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Uptimedog/Cougar
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.9.0
Choose a base ref
...
head repository: Uptimedog/Cougar
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 9 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 16, 2024

  1. fixes

    Clivern committed Jun 16, 2024
    Copy the full SHA
    a852111 View commit details

Commits on Jun 22, 2024

  1. Update prom/prometheus Docker tag to v2.53.0 (#28)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jun 22, 2024
    Copy the full SHA
    7dc1313 View commit details

Commits on Jun 25, 2024

  1. Update grafana/grafana Docker tag to v11.1.0 (#29)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jun 25, 2024
    Copy the full SHA
    3ed91a9 View commit details

Commits on Jul 23, 2024

  1. Update prom/prometheus Docker tag to v2.53.1 (#31)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 23, 2024
    Copy the full SHA
    07fedbd View commit details
  2. Update grafana/loki Docker tag to v3.1.0 (#30)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 23, 2024
    Copy the full SHA
    d068aa7 View commit details

Commits on Jan 14, 2025

  1. Copy the full SHA
    0ffdd4c View commit details
  2. Copy the full SHA
    89fb7dd View commit details
  3. Copy the full SHA
    e5fcee6 View commit details
  4. Update grafana/grafana Docker tag to v11.4.0 (#32)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jan 14, 2025
    Copy the full SHA
    4f5b0bc View commit details
Showing with 16 additions and 12 deletions.
  1. +8 −4 README.md
  2. +4 −4 config.alloy
  3. +4 −4 docker-compose.yaml
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -37,23 +37,27 @@ To install and run `alloy` on hosts

```zsh
$ mkdir -p /opt/alloy
$ mkdir -p /var/lib/alloy

$ cd /tmp
$ wget https://github.com/grafana/alloy/releases/download/v1.0.0/alloy-linux-amd64.zip
$ wget https://github.com/grafana/alloy/releases/download/v1.1.1/alloy-linux-amd64.zip
$ unzip alloy-linux-amd64.zip

$ mv alloy-linux-amd64 /opt/alloy/agent

$ groupadd -f alloy
$ useradd -g alloy --no-create-home --shell /bin/false alloy

$ chown -R alloy:alloy /opt/alloy
$ chown -R alloy:alloy /var/lib/alloy
```

Create `/opt/alloy/config.alloy` from `config.alloy` in this repo. Then run alloy as a systemd service.

```zsh
$ echo "[Unit]
Description=Node Exporter
Documentation=https://prometheus.io/docs/guides/node-exporter/
Description=Alloy
Documentation=https://github.com/grafana/alloy
Wants=network-online.target
After=network-online.target
@@ -66,7 +70,7 @@ Environment="REMOTE_LOKI_WRITE_URL=http://X.X.X.X:3100/loki/api/v1/push"
Environment="REMOTE_PROMETHEUS_WRITE_URL=http://X.X.X.X:9090/api/v1/write"
Environment="REMOTE_PROMETHEUS_USERNAME=admin"
Environment="REMOTE_PROMETHEUS_PASSWORD=password"
ExecStart=/opt/alloy/agent run /opt/alloy/config.alloy
ExecStart=/opt/alloy/agent run --storage.path=/var/lib/alloy /opt/alloy/config.alloy
[Install]
WantedBy=multi-user.target" > /etc/systemd/system/alloy.service
8 changes: 4 additions & 4 deletions config.alloy
Original file line number Diff line number Diff line change
@@ -25,16 +25,16 @@ logging {

// Collect metrics from the local running Alloy instance and forward to
// Prometheus.
prometheus.exporter.self "home_rpi_alloy" {}
prometheus.scrape "home_rpi_alloy" {
targets = prometheus.exporter.self.home_rpi_alloy.targets
prometheus.exporter.self "cougar_host" {}
prometheus.scrape "cougar_host" {
targets = prometheus.exporter.self.cougar_host.targets

forward_to = [prometheus.remote_write.remote_prometheus.receiver]
}

loki.source.file "badger_logs" {
targets = [
{__path__ = "/var/logs/badger.log", "color" = "pink", "service_name" = "badger", "component" = "backend"},
{__path__ = "/var/log/badger.log", "color" = "pink", "service_name" = "badger", "component" = "backend"},
]
forward_to = [loki.write.remote_loki.receiver]
}
8 changes: 4 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ version: '3.8'
services:
# Tempo Container
tempo:
image: grafana/tempo:2.5.0
image: grafana/tempo:2.7.0
command:
- -config.file=/etc/tempo.yaml
volumes:
@@ -19,7 +19,7 @@ services:

# Prometheus Container
prometheus:
image: prom/prometheus:v2.52.0
image: prom/prometheus:v3.1.0
command:
- --config.file=/etc/prometheus/prometheus.yml
- --web.enable-remote-write-receiver
@@ -36,7 +36,7 @@ services:

# Grafana Container
grafana:
image: grafana/grafana:11.0.0
image: grafana/grafana:11.4.0
environment:
- GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}
- GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
@@ -52,7 +52,7 @@ services:

# Loki Container
loki:
image: grafana/loki:3.0.0
image: grafana/loki:3.3.2
command:
- -config.file=/etc/loki/local-config.yaml
ports: