Skip to content

Commit

Permalink
Merge branch 'andrew/organize-utils-icos-group-9' into 'master'
Browse files Browse the repository at this point in the history
Chore(NODE-1353): Organize metrics-proxy under monitoring/ component

Organize metrics-proxy under monitoring/ component and update code ownership. 

Note that this change only moves the location of the metrics-proxy files _in the repository_. It has no impact on IC-OS build targets. 

See merge request dfinity-lab/public/ic!19300
  • Loading branch information
andrewbattat committed May 24, 2024
2 parents 4f2af73 + 76fa5d1 commit 4dfeaeb
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 24 deletions.
5 changes: 1 addition & 4 deletions .gitlab/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ go_deps.bzl @dfinity-lab/teams/idx
/toolchains/ @dfinity-lab/teams/node-team

# [metrics-proxy]
/ic-os/rootfs/hostos/etc/metrics-proxy.yaml @dfinity-lab/teams/DRE
/ic-os/rootfs/hostos/etc/systemd/system/metrics-proxy.service @dfinity-lab/teams/DRE
/ic-os/rootfs/guestos/etc/metrics-proxy.yaml @dfinity-lab/teams/DRE
/ic-os/rootfs/guestos/etc/systemd/system/metrics-proxy.service @dfinity-lab/teams/DRE
/ic-os/rootfs/monitoring/metrics-proxy/ @dfinity-lab/teams/DRE

# [GitLab-CI]
/.pre-commit-config.yaml @dfinity-lab/teams/idx
Expand Down
4 changes: 2 additions & 2 deletions ic-os/rootfs/guestos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ rootfs_files = {
Label("//ic-os/rootfs/guestos:etc/sysctl.d/privileged-ports.conf"): "/etc/sysctl.d/privileged-ports.conf",
Label("//ic-os/rootfs/guestos:etc/sysfs.d/hugepage.conf"): "/etc/sysfs.d/hugepage.conf",
Label("//ic-os/rootfs/guestos:etc/tmpfiles.d/ic-node.conf"): "/etc/tmpfiles.d/ic-node.conf",
Label("//ic-os/rootfs/guestos:etc/metrics-proxy.yaml"): "/etc/metrics-proxy.yaml",
Label("//ic-os/rootfs/guestos:etc/systemd/system/metrics-proxy.service"): "/etc/systemd/system/metrics-proxy.service",

# prep files:
Label("//ic-os/rootfs/guestos:prep/filebeat/filebeat.fc"): "/prep/filebeat/filebeat.fc",
Expand Down Expand Up @@ -129,4 +127,6 @@ rootfs_files = {
Label("monitoring/node_exporter/setup-node_exporter-keys/setup-node_exporter-keys.sh"): "/opt/ic/bin/setup-node_exporter-keys.sh",
Label("monitoring/node_exporter/setup-node_exporter-keys/setup-node_exporter-keys.service"): "/etc/systemd/system/setup-node_exporter-keys.service",
Label("hostos-scripts/vsock/10-vhost-vsock.rules"): "/etc/udev/rules.d/10-vhost-vsock.rules",
Label("monitoring/metrics-proxy/guestos/metrics-proxy.yaml"): "/etc/metrics-proxy.yaml",
Label("monitoring/metrics-proxy/metrics-proxy.service"): "/etc/systemd/system/metrics-proxy.service",
}
4 changes: 2 additions & 2 deletions ic-os/rootfs/hostos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ rootfs_files = {
Label("hostos/etc/sudoers"): "/etc/sudoers",
Label("hostos/etc/tmpfiles.d/ic-node.conf"): "/etc/tmpfiles.d/ic-node.conf",
Label("hostos/etc/udev/rules.d/20-ipmi.rules"): "/etc/udev/rules.d/20-ipmi.rules",
Label("hostos/etc/metrics-proxy.yaml"): "/etc/metrics-proxy.yaml",
Label("hostos/etc/systemd/system/metrics-proxy.service"): "/etc/systemd/system/metrics-proxy.service",

# consolidated files:
Label("misc/metrics.sh"): "/opt/ic/bin/metrics.sh",
Expand Down Expand Up @@ -73,4 +71,6 @@ rootfs_files = {
Label("monitoring/node_exporter/node_exporter"): "/etc/default/node_exporter",
Label("monitoring/node_exporter/setup-node_exporter-keys/setup-node_exporter-keys.sh"): "/opt/ic/bin/setup-node_exporter-keys.sh",
Label("monitoring/node_exporter/setup-node_exporter-keys/setup-node_exporter-keys.service"): "/etc/systemd/system/setup-node_exporter-keys.service",
Label("monitoring/metrics-proxy/hostos/metrics-proxy.yaml"): "/etc/metrics-proxy.yaml",
Label("monitoring/metrics-proxy/metrics-proxy.service"): "/etc/systemd/system/metrics-proxy.service",
}
16 changes: 0 additions & 16 deletions ic-os/rootfs/hostos/etc/systemd/system/metrics-proxy.service

This file was deleted.

File renamed without changes.
File renamed without changes.

0 comments on commit 4dfeaeb

Please sign in to comment.