From 4c07c5bebe8cd2adf0be7912666683708108d11c Mon Sep 17 00:00:00 2001 From: Nikita Safonov Date: Sun, 16 Feb 2020 16:30:52 +0300 Subject: [PATCH 1/2] add ns3777k prometheus recipe --- .../1.0/config/packages/ns3777k_prometheus.yaml | 7 +++++++ .../1.0/config/packages/test/ns3777k_prometheus.yaml | 2 ++ ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml | 2 ++ ns3777k/prometheus-bundle/1.0/manifest.json | 8 ++++++++ 4 files changed, 19 insertions(+) create mode 100644 ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml create mode 100644 ns3777k/prometheus-bundle/1.0/config/packages/test/ns3777k_prometheus.yaml create mode 100644 ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml create mode 100644 ns3777k/prometheus-bundle/1.0/manifest.json diff --git a/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml b/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml new file mode 100644 index 00000000..e6b30933 --- /dev/null +++ b/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml @@ -0,0 +1,7 @@ +ns3777k_prometheus: + namespace: app + adapter: apcu + + listener: + enabled: true + ignored_routes: [metrics, _wdt] diff --git a/ns3777k/prometheus-bundle/1.0/config/packages/test/ns3777k_prometheus.yaml b/ns3777k/prometheus-bundle/1.0/config/packages/test/ns3777k_prometheus.yaml new file mode 100644 index 00000000..c1975754 --- /dev/null +++ b/ns3777k/prometheus-bundle/1.0/config/packages/test/ns3777k_prometheus.yaml @@ -0,0 +1,2 @@ +ns3777k_prometheus: + adapter: in_memory diff --git a/ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml b/ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml new file mode 100644 index 00000000..af1e1845 --- /dev/null +++ b/ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml @@ -0,0 +1,2 @@ +metrics: + resource: '@Ns3777kPrometheusBundle/Resources/config/routing.xml' diff --git a/ns3777k/prometheus-bundle/1.0/manifest.json b/ns3777k/prometheus-bundle/1.0/manifest.json new file mode 100644 index 00000000..b683f1a1 --- /dev/null +++ b/ns3777k/prometheus-bundle/1.0/manifest.json @@ -0,0 +1,8 @@ +{ + "bundles": { + "Ns3777k\\PrometheusBundle\\Ns3777kPrometheusBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From 044886b7e8a20eb9d3e0e345c48e0ebab8dd7885 Mon Sep 17 00:00:00 2001 From: Nikita Safonov Date: Thu, 12 Mar 2020 02:30:10 +0300 Subject: [PATCH 2/2] rename metrics route file and remove enabled from listener in ns3777k prometheus recipe --- .../1.0/config/packages/ns3777k_prometheus.yaml | 1 - .../routes/{metrics.yaml => ns3777k_prometheus_metrics.yaml} | 0 2 files changed, 1 deletion(-) rename ns3777k/prometheus-bundle/1.0/config/routes/{metrics.yaml => ns3777k_prometheus_metrics.yaml} (100%) diff --git a/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml b/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml index e6b30933..e17c7a38 100644 --- a/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml +++ b/ns3777k/prometheus-bundle/1.0/config/packages/ns3777k_prometheus.yaml @@ -3,5 +3,4 @@ ns3777k_prometheus: adapter: apcu listener: - enabled: true ignored_routes: [metrics, _wdt] diff --git a/ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml b/ns3777k/prometheus-bundle/1.0/config/routes/ns3777k_prometheus_metrics.yaml similarity index 100% rename from ns3777k/prometheus-bundle/1.0/config/routes/metrics.yaml rename to ns3777k/prometheus-bundle/1.0/config/routes/ns3777k_prometheus_metrics.yaml