1
0

Compare commits

...

9 Commits

Author SHA1 Message Date
Frank Waßmuth
e8d4a82581 Add temperature metrics 2022-08-04 10:27:59 +02:00
Frank Waßmuth
6765bdf0c2 Add moonbeam and sunbread to prometheus 2022-08-04 10:27:37 +02:00
aece0896cf dns: fix typo in ip address 2022-08-01 11:59:02 +02:00
5e3c65b2b3 router, dns: fix IP to MAC assignment and add dns records for programmtresen signage 2022-08-01 11:54:24 +02:00
Garionion
5eb12ec443 dns: add more lama stuff 2022-08-01 09:31:42 +02:00
Ember 'n0emis' Keske
87367833a2 add static dhcp lease for simens logo stechuhr 2022-07-31 21:31:58 +02:00
Ember 'n0emis' Keske
d10376aaff scrape energy exporter 2022-07-31 19:38:16 +02:00
Frank Waßmuth
6facda326c Switch config field changes 2022-07-31 16:31:07 +02:00
Frank Waßmuth
7e37d9639e Add YATE and wifi monitoring 2022-07-31 16:30:17 +02:00
8 changed files with 2359 additions and 838 deletions

View File

@@ -2,7 +2,7 @@ $ORIGIN bula22.de.
$TTL 3600 $TTL 3600
bula22.de. IN SOA dns.bula22.de. hostmaster.bula22.de. ( bula22.de. IN SOA dns.bula22.de. hostmaster.bula22.de. (
2022073003 2022080101
10800 10800
3600 3600
604800 604800
@@ -115,3 +115,15 @@ gw.programmtresen.net.bula22.de. IN A 10.42.211.1
IN AAAA fd00:10:42:211::1 IN AAAA fd00:10:42:211::1
gw.open-office.net.bula22.de. IN A 10.42.212.1 gw.open-office.net.bula22.de. IN A 10.42.212.1
IN AAAA fd00:10:42:212::1 IN AAAA fd00:10:42:212::1
; Programmtresen
signage-11.bula22.de. IN A 10.42.211.11
signage-12.bula22.de. IN A 10.42.211.12
signage-13.bula22.de. IN A 10.42.211.13
signage-21.bula22.de. IN A 10.42.211.21
signage-22.bula22.de. IN A 10.42.211.22
signage-23.bula22.de. IN A 10.42.211.23
signage-24.bula22.de. IN A 10.42.211.24
signage-25.bula22.de. IN A 10.42.211.25
signage-31.bula22.de. IN A 10.42.211.31
signage-32.bula22.de. IN A 10.42.211.32

View File

@@ -15,3 +15,6 @@ rancher.oncamp.m2yk8s.de. IN CNAME lama-2.bula22.de.
minio.oncamp.m2yk8s.de. IN CNAME lama-2.bula22.de. minio.oncamp.m2yk8s.de. IN CNAME lama-2.bula22.de.
s3.oncamp.m2yk8s.de. IN CNAME lama-2.bula22.de. s3.oncamp.m2yk8s.de. IN CNAME lama-2.bula22.de.
registry.oncamp.m2yk8s.de. IN CNAME lama-1.bula22.de. registry.oncamp.m2yk8s.de. IN CNAME lama-1.bula22.de.
dashboard.oncamp.m2yk8s.de. IN CNAME lama-2.bula22.de.
_acme-challenge.dashboard.oncamp.m2yk8s.de. TXT ZDba8ibIumMhHmCqGsddGTkjLK-yinWNiSXar38sN8c

View File

@@ -110,6 +110,8 @@ with lib;
"[::1]:9100" "[::1]:9100"
"radius.bula22.de:9100" "radius.bula22.de:9100"
"router.bula22.de:9100" "router.bula22.de:9100"
"mooncake.bula22.de:9100"
"sunbread.bula22.de:9100"
]; ];
} }
]; ];
@@ -328,6 +330,7 @@ with lib;
"sw-trabantenstadt.bula22.de" "sw-trabantenstadt.bula22.de"
"sw-bll.bula22.de" "sw-bll.bula22.de"
"sw-finanzen.bula22.de" "sw-finanzen.bula22.de"
"wlan-controller.bula22.de"
]; ];
} }
]; ];
@@ -346,6 +349,93 @@ with lib;
} }
]; ];
} }
{
job_name = "aruba";
scrape_interval = "120s";
scrape_timeout = "40s";
metrics_path = "/snmp";
params = {
module = [
"aruba"
];
};
static_configs = [
{
targets = [
"wlan-controller.bula22.de"
];
}
];
relabel_configs = [
{
source_labels = [ "__address__" ];
target_label = "__param_target";
}
{
source_labels = [ "__param_target" ];
target_label = "instance";
}
{
target_label = "__address__";
replacement = "[::1]:9116";
}
];
}
{
job_name = "yate";
scrape_interval = "30s";
scrape_timeout = "20s";
metrics_path = "/snmp";
params = {
module = [
"yate"
];
};
static_configs = [
{
targets = [
"10.42.10.6"
];
labels = {
instance = "yate.bula22.de";
};
}
{
targets = [
"10.42.10.9"
];
labels = {
instance = "yate-dialup.bula22.de";
};
}
];
relabel_configs = [
{
source_labels = [ "__address__" ];
target_label = "__param_target";
}
{
source_labels = [ "__param_target" ];
target_label = "instance";
}
{
target_label = "__address__";
replacement = "[::1]:9116";
}
];
}
{
job_name = "energy";
scrape_interval = "1s";
scrape_timeout = "1s";
static_configs = [
{
targets = [
"pbs.bula22.de:9555"
];
}
];
}
]; ];
alertmanagers = [ alertmanagers = [
{ {

File diff suppressed because it is too large Load Diff

View File

@@ -52,6 +52,10 @@
hw-address = "00:03:c5:01:13:2b"; hw-address = "00:03:c5:01:13:2b";
ip-address = "10.42.151.2"; ip-address = "10.42.151.2";
} }
{ # siemens logo stechuhr
hw-address = "bc:f3:19:30:d2:1b";
ip-address = "10.42.151.3";
}
]; ];
} }
]; ];

View File

@@ -49,43 +49,53 @@
]; ];
reservations = [ reservations = [
{ {
# signage-11
hw-address = "e4:5f:01:91:f7:fe"; hw-address = "e4:5f:01:91:f7:fe";
ip-address = "10.42.211.11"; ip-address = "10.42.211.11";
} }
{ {
# signage-12
hw-address = "e4:5f:01:92:08:13"; hw-address = "e4:5f:01:92:08:13";
ip-address = "10.42.211.12"; ip-address = "10.42.211.12";
} }
{ {
# signage-13
hw-address = "e4:5f:01:91:f5:59"; hw-address = "e4:5f:01:91:f5:59";
ip-address = "10.42.211.13"; ip-address = "10.42.211.13";
} }
{ {
# signage-21
hw-address = "e4:5f:01:93:70:86"; hw-address = "e4:5f:01:93:70:86";
ip-address = "10.42.211.21"; ip-address = "10.42.211.21";
} }
{ {
hw-address = "e4:5f:01:93:5b:52"; # signage-22
hw-address = "e4:5f:01:93:5b:53";
ip-address = "10.42.211.22"; ip-address = "10.42.211.22";
} }
{ {
hw-address = "e4:5f:01:93:5c:38"; # signage-23
hw-address = "e4:5f:01:93:5c:39";
ip-address = "10.42.211.23"; ip-address = "10.42.211.23";
} }
{ {
hw-address = "e4:5f:01:93:58:ac"; # signage-24
hw-address = "e4:5f:01:93:58:ad";
ip-address = "10.42.211.24"; ip-address = "10.42.211.24";
} }
{ {
hw-address = "e4:5f:01:93:5b:e8"; # signage-25
hw-address = "e4:5f:01:93:5b:e9";
ip-address = "10.42.211.25"; ip-address = "10.42.211.25";
} }
{ {
hw-address = "b8:27:eb:98:a2:ba"; # signage-31
hw-address = "b8:27:eb:cd:f7:ef";
ip-address = "10.42.211.31"; ip-address = "10.42.211.31";
} }
{ {
hw-address = "b8:27:eb:4e:09:a4"; # signage-32
hw-address = "b8:27:eb:1b:5c:f1";
ip-address = "10.42.211.32"; ip-address = "10.42.211.32";
} }
]; ];

View File

@@ -1,4 +1,4 @@
## Last changed: 2016-01-22 12:48:52 UTC ## Last changed: 2016-01-24 12:14:48 UTC
version 12.3R12.4; version 12.3R12.4;
groups { groups {
backbone_vlans { backbone_vlans {
@@ -7,7 +7,7 @@ groups {
unit 0 { unit 0 {
family ethernet-switching { family ethernet-switching {
vlan { vlan {
members [ VL_SIP VL_DECT VL_HOSPITAL VL_IKT VL_IKT_TOYS VL_INFOJURTE VL_INTERNATIONAL VL_IOT VL_LEITSTELLE VL_MGMT VL_OFFICE VL_PROGRAMM VL_TECHNIK VL_VERWALTUNG VL_WLAN VL_YOLO VL_ZENTRAL VL_MAV ]; members [ VL_SIP VL_DECT VL_HOSPITAL VL_IKT VL_IKT_TOYS VL_INFOJURTE VL_INTERNATIONAL VL_IOT VL_LEITSTELLE VL_MGMT VL_OFFICE VL_PROGRAMM VL_TECHNIK VL_VERWALTUNG VL_WLAN VL_YOLO VL_ZENTRAL VL_MAV VL_AUDIO ];
} }
} }
} }
@@ -51,8 +51,19 @@ interfaces {
ge-0/0/0 { ge-0/0/0 {
unit 0 { unit 0 {
family ethernet-switching { family ethernet-switching {
port-mode trunk;
vlan { vlan {
members VL_WLAN; members VL_AUDIO;
}
native-vlan-id VL_WLAN;
}
}
}
ge-0/0/1 {
unit 0 {
family ethernet-switching {
vlan {
members VL_AUDIO;
} }
} }
} }
@@ -113,6 +124,10 @@ ethernet-switching-options {
} }
} }
vlans { vlans {
VL_AUDIO {
description "Buehne Ton";
vlan-id 215;
}
VL_DECT { VL_DECT {
vlan-id 132; vlan-id 132;
} }

View File

@@ -1,28 +1,36 @@
; J9774A Configuration Editor; Created on release #YA.16.10.0001 ; J9298A Configuration Editor; Created on release #J.15.09.0028
; Ver #14:01.44.00.04.19.02.13.98.82.34.61.18.28.f3.84.9c.63.ff.37.27:45 ; Ver #06:04.08.00.01.14.05:1a
hostname "sw-finanzen" hostname "sw-bll"
time timezone 60 time timezone 60
ip default-gateway 10.42.42.1 ip default-gateway 10.42.42.1
ip dns domain-name "bula22.de" ip dns domain-name "bula22.de"
ip dns server-address priority 1 10.42.10.8 ip dns server-address priority 1 10.42.10.8
ip ssh filetransfer ip ssh filetransfer
interface 10
name "UPLINK sw-verwaltung"
exit
snmp-server community "tellme" operator snmp-server community "tellme" operator
vlan 1 vlan 1
name "DEFAULT_VLAN" name "DEFAULT_VLAN"
untagged 1-10 no untagged 1-9
untagged 10
no ip address no ip address
exit exit
vlan 42 vlan 42
name "VL_MGMT" name "VL_MGMT"
tagged 10 tagged 10
ip address 10.42.42.28 255.255.255.0 ip address 10.42.42.27 255.255.255.0
exit
vlan 206
name "VL_VERWALTUNG"
untagged 1-9
tagged 10
no ip address
exit exit
management-vlan 42 management-vlan 42
no tftp client no tftp client
no tftp server no tftp server
loop-protect 1-10 loop-protect 1-10
no dhcp config-file-update no dhcp config-file-update
no dhcp image-file-update
no dhcp tr69-acs-url
password manager password manager