From d6ed4b4521037e623a9f42ddca2a80cc390cfdf2 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Wed, 12 Feb 2025 12:14:40 +0100 Subject: [PATCH] Use IPMI host names instead of IP addresses --- m/common/xeon/net.nix | 20 ++++++++++---------- m/hut/monitoring.nix | 4 ++-- m/hut/targets.yml | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/m/common/xeon/net.nix b/m/common/xeon/net.nix index ce1d3bc..965bc1f 100644 --- a/m/common/xeon/net.nix +++ b/m/common/xeon/net.nix @@ -34,37 +34,37 @@ # Node Entry for node: mds01 (ID=72) 10.0.40.40 bay mds01 mds01-eth0 10.0.42.40 bay-ib mds01-ib0 - 10.0.40.141 bay-ipmi mds01-ipmi0 + 10.0.40.141 bay-ipmi mds01-ipmi0 mds01-ipmi # Node Entry for node: oss01 (ID=73) 10.0.40.41 oss01 oss01-eth0 10.0.42.41 oss01-ib0 - 10.0.40.142 oss01-ipmi0 + 10.0.40.142 oss01-ipmi0 oss01-ipmi # Node Entry for node: oss02 (ID=74) 10.0.40.42 lake2 oss02 oss02-eth0 10.0.42.42 lake2-ib oss02-ib0 - 10.0.40.143 lake2-ipmi oss02-ipmi0 + 10.0.40.143 lake2-ipmi oss02-ipmi0 oss02-ipmi # Node Entry for node: xeon01 (ID=15) 10.0.40.1 owl1 xeon01 xeon01-eth0 10.0.42.1 owl1-ib xeon01-ib0 - 10.0.40.101 owl1-ipmi xeon01-ipmi0 + 10.0.40.101 owl1-ipmi xeon01-ipmi0 xeon01-ipmi # Node Entry for node: xeon02 (ID=16) 10.0.40.2 owl2 xeon02 xeon02-eth0 10.0.42.2 owl2-ib xeon02-ib0 - 10.0.40.102 owl2-ipmi xeon02-ipmi0 + 10.0.40.102 owl2-ipmi xeon02-ipmi0 xeon02-ipmi # Node Entry for node: xeon03 (ID=17) 10.0.40.3 xeon03 xeon03-eth0 10.0.42.3 xeon03-ib0 - 10.0.40.103 xeon03-ipmi0 + 10.0.40.103 xeon03-ipmi0 xeon03-ipmi # Node Entry for node: xeon04 (ID=18) 10.0.40.4 xeon04 xeon04-eth0 10.0.42.4 xeon04-ib0 - 10.0.40.104 xeon04-ipmi0 + 10.0.40.104 xeon04-ipmi0 xeon04-ipmi # Node Entry for node: xeon05 (ID=19) 10.0.40.5 koro xeon05 xeon05-eth0 @@ -74,17 +74,17 @@ # Node Entry for node: xeon06 (ID=20) 10.0.40.6 xeon06 xeon06-eth0 10.0.42.6 xeon06-ib0 - 10.0.40.106 xeon06-ipmi0 + 10.0.40.106 xeon06-ipmi0 xeon06-ipmi # Node Entry for node: xeon07 (ID=21) 10.0.40.7 hut xeon07 xeon07-eth0 10.0.42.7 hut-ib xeon07-ib0 - 10.0.40.107 hut-ipmi xeon07-ipmi0 + 10.0.40.107 hut-ipmi xeon07-ipmi0 xeon07-ipmi # Node Entry for node: xeon08 (ID=22) 10.0.40.8 eudy xeon08 xeon08-eth0 10.0.42.8 eudy-ib xeon08-ib0 - 10.0.40.108 eudy-ipmi xeon08-ipmi0 + 10.0.40.108 eudy-ipmi xeon08-ipmi0 xeon08-ipmi # fox 10.0.40.26 fox diff --git a/m/hut/monitoring.nix b/m/hut/monitoring.nix index 5c60260..64c738c 100644 --- a/m/hut/monitoring.nix +++ b/m/hut/monitoring.nix @@ -208,7 +208,7 @@ # Sets the "instance" label with the remote host we are querying source_labels = [ "__param_target" ]; separator = ";"; - regex = "(.*)"; + regex = "(.*)-ipmi"; # Remove "-ipm̀i" at the end target_label = "instance"; replacement = "\${1}"; action = "replace"; @@ -257,7 +257,7 @@ { targets = [ "127.0.0.1:9290" ]; } ]; params = { - target = [ "10.0.40.126" ]; + target = [ "fox-ipmi" ]; module = [ "fox" ]; }; } diff --git a/m/hut/targets.yml b/m/hut/targets.yml index 8924735..c04f864 100644 --- a/m/hut/targets.yml +++ b/m/hut/targets.yml @@ -1,15 +1,15 @@ - targets: - - 10.0.40.101 - - 10.0.40.102 - - 10.0.40.103 - - 10.0.40.104 - - 10.0.40.105 - - 10.0.40.106 - - 10.0.40.107 - - 10.0.40.108 + - owl1-ipmi + - owl2-ipmi + - xeon03-ipmi + - xeon04-ipmi + - koro-ipmi + - xeon06-ipmi + - hut-ipmi + - eudy-ipmi # Storage - - 10.0.40.141 - - 10.0.40.142 - - 10.0.40.143 + - bay-ipmi + - oss01-ipmi + - lake2-ipmi labels: job: ipmi-lan