Switch config field changes

hosts/monitoring/configuration.nix

@@ -328,6 +328,7 @@ with lib;
               "sw-trabantenstadt.bula22.de"
               "sw-bll.bula22.de"
               "sw-finanzen.bula22.de"
+              "wlan-controller.bula22.de"
             ];
           }
         ];
@@ -346,6 +347,81 @@ 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";
+          }
+        ];
+      }
     ];
     alertmanagers = [
       {

switchconfig/sw-buehne

@@ -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;
 groups {
     backbone_vlans {
@@ -7,7 +7,7 @@ groups {
                 unit 0 {
                     family ethernet-switching {
                         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 {
         unit 0 {
             family ethernet-switching {
+                port-mode trunk;
                 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 {
+    VL_AUDIO {
+        description "Buehne Ton";
+        vlan-id 215;
+    }
     VL_DECT {
         vlan-id 132;
     }

switchconfig/sw-finanzen

@@ -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
 ip default-gateway 10.42.42.1
 ip dns domain-name "bula22.de"
 ip dns server-address priority 1 10.42.10.8
 ip ssh filetransfer
+interface 10
+   name "UPLINK sw-verwaltung"
+   exit
 snmp-server community "tellme" operator
 vlan 1
    name "DEFAULT_VLAN"
-   untagged 1-10
+   no untagged 1-9
+   untagged 10
    no ip address
    exit
 vlan 42
    name "VL_MGMT"
    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
 management-vlan 42
 no tftp client
 no tftp server
 loop-protect 1-10
 no dhcp config-file-update
-no dhcp image-file-update
-no dhcp tr69-acs-url
 password manager