Merge pull request #8 from eachristgr/prometheus

Prometheus
dmwm · Sep 16, 2024 · d613565 · d613565
2 parents ef5bfed + 3fec8a7
commit d613565
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/docker/push2prometheus.py b/docker/push2prometheus.py
@@ -4,7 +4,7 @@
 from rucio.common.config import config_get
 from rucio.core.monitor import MetricManager
 
-PROBES_PREFIX = 'consistency_check'
+PROBES_PREFIX = 'rucio.consistency'
 probe_metrics = MetricManager(prefix=PROBES_PREFIX)
 
 def get_prometheus_config() -> Tuple[List, str, Dict]:

diff --git a/docker/rucio.cfg.j2 b/docker/rucio.cfg.j2
@@ -21,6 +21,9 @@ pool_recycle = {{ RUCIO_CFG_DATABASE_POOL_RECYCLE | default('600') }}
 carbon_server = {{ RUCIO_CFG_MONITOR_CARBON_SERVER | default('localhost') }}
 carbon_port = {{ RUCIO_CFG_MONITOR_CARBON_PORT | default('8125') }}
 user_scope = {{ RUCIO_CFG_MONITOR_USER_SCOPE | default('default_docker') }}
+prometheus_servers = {{ PROMETHEUS_SERVERS | default('') }}
+prometheus_prefix = {{ PROMETHEUS_PREFIX | default('') }}
+prometheus_labels = {{ PROMETHEUS_LABELS | default('') }}
 
 [trace]
 tracedir = {{ RUCIO_CFG_TRACE_TRACEDIR | default('/var/log/rucio/trace') }}
@@ -52,3 +55,10 @@ usercert = {{ RUCIO_CFG_WEBUI_USERCERT | default('/opt/rucio/etc/usercert_with_k
 [oidc]
 idpsecrets = {{ RUCIO_CFG_OIDC_IDPSECRETS | default('/opt/rucio/etc/idpsecrets.json') }}
 {% if RUCIO_CFG_OIDC_ADMIN_ISSUER is defined %}admin_issuer = {{ RUCIO_CFG_OIDC_ADMIN_ISSUER }}{% endif %}
+
+[client]
+rucio_host = {{ RUCIO_HOST | default('') }}
+auth_host = {{ AUTH_HOST | default('') }}
+auth_type = {{ AUTH_TYPE | default('') }}
+ca_cert = {{ CA_CERT | default('') }}
+request_retries = {{ REQUEST_RETRIES | default('3') }}
diff --git a/docker/site.sh b/docker/site.sh
@@ -5,7 +5,7 @@ cd /consistency/cms_consistency/site_cmp3
 cp /opt/proxy/x509up /tmp/x509up
 chmod 600 /tmp/x509up
 export X509_USER_PROXY=/tmp/x509up
-export RUCIO_CONFIG=/consistency/rucio-client.cfg
+export RUCIO_CONFIG=/opt/rucio/etc/rucio.cfg
 export PYTHON=python3
 
 cfg_src=/config/config.yaml