diff --git a/config/grafana/dashboards/monero.json b/config/grafana/dashboards/monero.json index 0e342e4..ffdaba1 100644 --- a/config/grafana/dashboards/monero.json +++ b/config/grafana/dashboards/monero.json @@ -86,7 +86,7 @@ { "exemplar": true, "expr": "monero_info_mainnet", - "instant": true, + "instant": false, "interval": "", "legendFormat": "mainnet", "refId": "A" @@ -5363,25 +5363,7 @@ "list": [ { "allValue": null, - "current": { - "selected": true, - "text": [ - "0.05", - "0.25", - "0.5", - "0.75", - "0.95", - "1" - ], - "value": [ - "0.05", - "0.25", - "0.5", - "0.75", - "0.95", - "1" - ] - }, + "current": {}, "datasource": null, "definition": "label_values(monero_lastblock_transactions_inputs,quantile)", "description": "quantile to filter for in the panels that use distributions", diff --git a/config/grafana/grafana.ini b/config/grafana/grafana.ini index 6d6478f..b296b63 100644 --- a/config/grafana/grafana.ini +++ b/config/grafana/grafana.ini @@ -14,7 +14,7 @@ org_role = Admin [dashboards] min_refresh_interval = 1m -default_home_dashboard_path = dashboards/monero.json +default_home_dashboard_path = /var/lib/grafana/dashboards/monero.json [paths] provisioning = /etc/grafana/provisioning @@ -25,6 +25,9 @@ root_url = https://127.0.0.1/grafana enable_gzip = true read_timeout = 2m - [snapshots] external_enabled = false + +[security] +admin_user = admin +admin_password = xmrsh-admin \ No newline at end of file diff --git a/config/prometheus/Dockerfile b/config/prometheus/Dockerfile deleted file mode 100644 index 99b0e72..0000000 --- a/config/prometheus/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 -ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:97f9cbf81590c7dd878d7e10c20116fa7488c2fb91b3c839df1ebdcb61ab13ca - - -FROM $BUILDER_IMAGE AS builder - - ARG VERSION=2.28.1 - ARG SHA256=91dd91e13f30fe520e01175ca1027dd09a458d4421a584ba557ba88b38803f27 - - RUN set -ex && \ - apt update && \ - apt install -y curl gzip - - RUN set -ex && \ - curl -SOL https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz && \ - echo "${SHA256} prometheus-${VERSION}.linux-amd64.tar.gz" | sha256sum -c && \ - tar xvzf prometheus-${VERSION}.linux-amd64.tar.gz --strip-components=1 && \ - mv ./prometheus /usr/local/bin/prometheus - - RUN mkdir /data - - -FROM $RUNTIME_IMAGE - - COPY --from=builder --chown=nonroot:nonroot /data /data - COPY --from=builder --chown=nonroot:nonroot /usr/local/bin/prometheus /usr/local/bin/prometheus - USER nonroot:nonroot - - ENTRYPOINT [ "prometheus" ] diff --git a/config/prometheus/config.yaml b/config/prometheus/config.yaml index b387614..555e9e4 100644 --- a/config/prometheus/config.yaml +++ b/config/prometheus/config.yaml @@ -1,8 +1,8 @@ global: - scrape_interval: '15s' - evaluation_interval: '15s' + scrape_interval: "10s" + evaluation_interval: "10s" scrape_configs: - - job_name: 'monerod' + - job_name: "monerod" static_configs: - targets: - - 'monerod:9000' + - "monero-exporter:9000"