feat(msd): adding label for api boundary nodes #483

NikolaMilosa · 2024-06-14T12:05:37Z

This PR adds a new label to the /prom/targets endpoint that is being used from victoria metrics to scrape targets.
The new labels only affect api boundary nodes. Other targets won't get the new label.
Output looks like:

...
  // Standard nodes
  
  {
    "targets": [
      "https://[2401:3f00:1000:23:6801:b3ff:fe4d:4fc7]:9091/"
    ],
    "labels": {
      "ic": "mercury",
      "ic_node": "kqurf-2p6ca-j4zte-3wkx5-rovid-kgn7s-yih6m-mj74k-claji-7uoje-vae",
      "job": "orchestrator"
    }
  },
  {
    "targets": [
      "https://[2401:3f00:1000:23:6801:b3ff:fe4d:4fc7]:9100/metrics"
    ],
    "labels": {
      "ic": "mercury",
      "ic_node": "kqurf-2p6ca-j4zte-3wkx5-rovid-kgn7s-yih6m-mj74k-claji-7uoje-vae",
      "job": "node_exporter"
    }
  },
  {
    "targets": [
      "https://[2401:3f00:1000:23:6800:b3ff:fe4d:4fc7]:9100/metrics"
    ],
    "labels": {
      "ic": "mercury",
      "ic_node": "kqurf-2p6ca-j4zte-3wkx5-rovid-kgn7s-yih6m-mj74k-claji-7uoje-vae",
      "job": "host_node_exporter"
    }
  },
  {
    "targets": [
      "https://[2401:3f00:1000:23:6800:b3ff:fe4d:4fc7]:19100/metrics"
    ],
    "labels": {
      "ic": "mercury",
      "ic_node": "kqurf-2p6ca-j4zte-3wkx5-rovid-kgn7s-yih6m-mj74k-claji-7uoje-vae",
      "job": "host_metrics_proxy"
    }
  },
  {
    "targets": [
      "https://[2401:3f00:1000:23:6801:b3ff:fe4d:4fc7]:19100/metrics"
    ],
    "labels": {
      "ic": "mercury",
      "ic_node": "kqurf-2p6ca-j4zte-3wkx5-rovid-kgn7s-yih6m-mj74k-claji-7uoje-vae",
      "job": "guest_metrics_proxy"
    }
  },
...
  // API boundary node 
  {
    "targets": [
      "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9091/"
    ],
    "labels": {
      "api_boundary_node": "1",
      "ic": "mercury",
      "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
      "job": "orchestrator"
    }
  },
  {
    "targets": [
      "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9100/metrics"
    ],
    "labels": {
      "api_boundary_node": "1",
      "ic": "mercury",
      "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
      "job": "node_exporter"
    }
  },
  {
    "targets": [
      "https://[2001:438:8000:1d:6800:c1ff:feac:bc9]:9100/metrics"
    ],
    "labels": {
      "api_boundary_node": "1",
      "ic": "mercury",
      "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
      "job": "host_node_exporter"
    }
  },
  {
    "targets": [
      "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9324/metrics"
    ],
    "labels": {
      "api_boundary_node": "1",
      "ic": "mercury",
      "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
      "job": "ic_boundary"
    }
  }
...

Includes small fix for CI for missing custom runner image.

github-actions · 2024-06-14T12:15:15Z

MSD Diff

targets.json

targets.json

--- a/home/runner/main-targets/targets.json
+++ b/home/runner/branch-targets/targets.json
@@ -80148,6 +80148,7 @@
       "https://[2001:920:401a:1710:6801:94ff:fe18:6b54]:9091/"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "orchestrator"
@@ -80158,6 +80159,7 @@
       "https://[2001:920:401a:1710:6801:94ff:fe18:6b54]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "node_exporter"
@@ -80168,6 +80170,7 @@
       "https://[2001:920:401a:1710:6800:94ff:fe18:6b54]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "host_node_exporter"
@@ -80178,6 +80181,7 @@
       "https://[2001:920:401a:1710:6801:94ff:fe18:6b54]:9324/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "ic_boundary"
@@ -80188,6 +80192,7 @@
       "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9091/"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "orchestrator"
@@ -80198,6 +80203,7 @@
       "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "node_exporter"
@@ -80208,6 +80214,7 @@
       "https://[2001:438:8000:1d:6800:c1ff:feac:bc9]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "host_node_exporter"
@@ -80218,6 +80225,7 @@
       "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9324/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "ic_boundary"

See the workflow run

r-birkner · 2024-06-14T12:28:27Z

Thanks 🙏

github-actions · 2024-06-17T12:46:46Z

MSD Diff

targets.json

targets.json

--- a/home/runner/main-targets/targets.json
+++ b/home/runner/branch-targets/targets.json
@@ -80098,6 +80098,7 @@
       "https://[2001:920:401a:1710:6801:94ff:fe18:6b54]:9091/"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "orchestrator"
@@ -80108,6 +80109,7 @@
       "https://[2001:920:401a:1710:6801:94ff:fe18:6b54]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "node_exporter"
@@ -80118,6 +80120,7 @@
       "https://[2001:920:401a:1710:6800:94ff:fe18:6b54]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "host_node_exporter"
@@ -80128,6 +80131,7 @@
       "https://[2001:920:401a:1710:6801:94ff:fe18:6b54]:9324/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "ag4ro-4ihpg-ozp6d-lbwac-5pksl-3wany-aaayw-ibvuw-uh7wj-lbav5-qae",
       "job": "ic_boundary"
@@ -80138,6 +80142,7 @@
       "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9091/"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "orchestrator"
@@ -80148,6 +80153,7 @@
       "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "node_exporter"
@@ -80158,6 +80164,7 @@
       "https://[2001:438:8000:1d:6800:c1ff:feac:bc9]:9100/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "host_node_exporter"
@@ -80168,6 +80175,7 @@
       "https://[2001:438:8000:1d:6801:c1ff:feac:bc9]:9324/metrics"
     ],
     "labels": {
+      "api_boundary_node": "1",
       "ic": "mercury",
       "ic_node": "5dpkp-lfhr2-j7mfz-gavpn-puej5-wdfzg-fw42o-zupnu-izvk3-ubzzi-6ae",
       "job": "ic_boundary"

See the workflow run

sasa-tomic

LGTM

adding label for api boundary nodes

afa857c

NikolaMilosa requested a review from a team as a code owner June 14, 2024 12:05

NikolaMilosa added 2 commits June 14, 2024 14:07

adding missing custom image

a29361a

fixing shell

8194c27

Merge branch 'main' into nm-adding-label-to-metrics

b568c71

sasa-tomic approved these changes Jun 17, 2024

View reviewed changes

NikolaMilosa merged commit 9706b01 into main Jun 17, 2024
5 checks passed

NikolaMilosa deleted the nm-adding-label-to-metrics branch June 17, 2024 12:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(msd): adding label for api boundary nodes #483

feat(msd): adding label for api boundary nodes #483

NikolaMilosa commented Jun 14, 2024 •

edited

Loading

github-actions bot commented Jun 14, 2024

targets.json

r-birkner commented Jun 14, 2024

github-actions bot commented Jun 17, 2024

targets.json

sasa-tomic left a comment

feat(msd): adding label for api boundary nodes #483

feat(msd): adding label for api boundary nodes #483

Conversation

NikolaMilosa commented Jun 14, 2024 • edited Loading

github-actions bot commented Jun 14, 2024

targets.json

r-birkner commented Jun 14, 2024

github-actions bot commented Jun 17, 2024

targets.json

sasa-tomic left a comment

Choose a reason for hiding this comment

NikolaMilosa commented Jun 14, 2024 •

edited

Loading