refactor: Rename cisco-vrf to vrf and enable discovery for junos os (#8033)

* device: Enable cisco-vrf discovery for junos os Signed-off-by: Misha Komarovskiy <zombah@gmail.com> * refactor: Rename cisco-vrf module into vrf Signed-off-by: Misha Komarovskiy <zombah@gmail.com>
2024-10-07 16:52:45 +00:00 · 2018-01-17 15:09:19 +03:00
parent 76587065cc
commit df731c165c
32 changed files with 36 additions and 29 deletions
--- a/doc/Support/Discovery
+++ b/doc/Support/Discovery
@@ -63,7 +63,7 @@ $config['discovery_modules']['mempools']             = 1;
 $config['discovery_modules']['cisco-vrf-lite']       = 1;
 $config['discovery_modules']['cisco-mac-accounting'] = 0;
 $config['discovery_modules']['cisco-pw']             = 0;
-$config['discovery_modules']['cisco-vrf']            = 0;
+$config['discovery_modules']['vrf']                  = 0;
 $config['discovery_modules']['cisco-cef']            = 0;
 $config['discovery_modules']['cisco-sla']            = 0;
 $config['discovery_modules']['cisco-cbqos']          = 0;
@@ -152,7 +152,7 @@ $config['os']['linux']['discovery_modules']['discovery-arp'] = 1;

 `cisco-pw`: Pseudowires wires detection and support.

-`cisco-vrf`: VRF detection and support.
+`vrf`: VRF detection and support.

 `cisco-cef`: CEF detection and support.

--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -780,7 +780,7 @@ $config['discovery_modules']['mempools']             = 1;
 $config['discovery_modules']['cisco-vrf-lite']       = 1;
 $config['discovery_modules']['cisco-mac-accounting'] = 0;
 $config['discovery_modules']['cisco-pw']             = 0;
-$config['discovery_modules']['cisco-vrf']            = 0;
+$config['discovery_modules']['vrf']                  = 0;
 $config['discovery_modules']['cisco-cef']            = 0;
 $config['discovery_modules']['cisco-sla']            = 0;
 $config['discovery_modules']['cisco-cbqos']          = 0;
--- a/includes/definitions/acano.yaml
+++ b/includes/definitions/acano.yaml
@@ -24,5 +24,5 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
--- a/includes/definitions/acs.yaml
+++ b/includes/definitions/acs.yaml
@@ -26,7 +26,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysObjectID:
--- a/includes/definitions/acsw.yaml
+++ b/includes/definitions/acsw.yaml
@@ -26,7 +26,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysObjectID: .1.3.6.1.4.1.9.1.1291
--- a/includes/definitions/apic.yaml
+++ b/includes/definitions/apic.yaml
@@ -23,7 +23,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysObjectID:
--- a/includes/definitions/cat1900.yaml
+++ b/includes/definitions/cat1900.yaml
@@ -27,7 +27,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/catos.yaml
+++ b/includes/definitions/catos.yaml
@@ -27,7 +27,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/cimc.yaml
+++ b/includes/definitions/cimc.yaml
@@ -23,7 +23,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/cips.yaml
+++ b/includes/definitions/cips.yaml
@@ -22,7 +22,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/ciscosce.yaml
+++ b/includes/definitions/ciscosce.yaml
@@ -27,7 +27,7 @@ discovery_modules:
    cisco-mac-accounting: 0
    cisco-otv: 0
    cisco-pw: 0
-    cisco-vrf: 0
+    vrf: 0
    cisco-vrf-lite: 0
 mib_dir:
    - cisco
--- a/includes/definitions/ciscowap.yaml
+++ b/includes/definitions/ciscowap.yaml
@@ -28,7 +28,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/ciscowlc.yaml
+++ b/includes/definitions/ciscowlc.yaml
@@ -25,7 +25,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/fxos.yaml
+++ b/includes/definitions/fxos.yaml
@@ -23,7 +23,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/ios.yaml
+++ b/includes/definitions/ios.yaml
@@ -43,7 +43,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 register_mibs:
    ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB
--- a/includes/definitions/iosxe.yaml
+++ b/includes/definitions/iosxe.yaml
@@ -28,7 +28,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 register_mibs:
    ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB
--- a/includes/definitions/iosxr.yaml
+++ b/includes/definitions/iosxr.yaml
@@ -28,7 +28,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 register_mibs:
    ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB
--- a/includes/definitions/ise.yaml
+++ b/includes/definitions/ise.yaml
@@ -22,7 +22,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/junos.yaml
+++ b/includes/definitions/junos.yaml
@@ -5,6 +5,8 @@ over:
    - { graph: device_bits, text: 'Device Traffic' }
    - { graph: device_processor, text: 'CPU Usage' }
    - { graph: device_mempool, text: 'Memory Usage' }
+discovery_modules:
+    vrf: 1
 discovery:
    - sysObjectID: .1.3.6.1.4.1.2636
    - sysDescr:
--- a/includes/definitions/nxos.yaml
+++ b/includes/definitions/nxos.yaml
@@ -27,7 +27,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/ons.yaml
+++ b/includes/definitions/ons.yaml
@@ -24,7 +24,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/pixos.yaml
+++ b/includes/definitions/pixos.yaml
@@ -38,7 +38,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/primeinfrastructure.yaml
+++ b/includes/definitions/primeinfrastructure.yaml
@@ -23,7 +23,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/sanos.yaml
+++ b/includes/definitions/sanos.yaml
@@ -25,7 +25,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 discovery:
    - sysDescr:
--- a/includes/definitions/tpconductor.yaml
+++ b/includes/definitions/tpconductor.yaml
@@ -18,7 +18,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/ucos.yaml
+++ b/includes/definitions/ucos.yaml
@@ -22,7 +22,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/vccodec.yaml
+++ b/includes/definitions/vccodec.yaml
@@ -18,7 +18,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/vcs.yaml
+++ b/includes/definitions/vcs.yaml
@@ -18,7 +18,7 @@ discovery_modules:
    cisco-mac-accounting: 1
    cisco-otv: 1
    cisco-pw: 1
-    cisco-vrf: 1
+    vrf: 1
    cisco-vrf-lite: 1
 mib_dir:
    - cisco
--- a/includes/definitions/waas.yaml
+++ b/includes/definitions/waas.yaml
@@ -32,7 +32,7 @@ discovery_modules:
    cisco-pw: 0
    cisco-sla: 0
    cisco-vrf-lite: 0
-    cisco-vrf: 0
+    vrf: 0
    libvirt-vminfo: 0
    ntp: 0
    stp: 0
--- a/includes/discovery/cisco-vrf.inc.php
+++ b/includes/discovery/cisco-vrf.inc.php
--- a/includes/process_config.inc.php
+++ b/includes/process_config.inc.php
@@ -49,6 +49,10 @@ if (isset($config['fping_options']['millisec']) && is_numeric($config['fping_opt
    $config['fping_options']['interval'] = $config['fping_options']['millisec'];
 }

+if (!empty($config['discovery_modules']['cisco-vrf']) && $config['discovery_modules']['cisco-vrf'] === true) {
+    $config['discovery_modules']['vrf'] = 1;
+}
+
 // make sure we have full path to binaries in case PATH isn't set
 foreach (array('fping', 'fping6', 'snmpgetnext') as $bin) {
    if (!is_executable(Config::get($bin))) {
--- a/sql-schema/230.sql
+++ b/sql-schema/230.sql
@@ -0,0 +1 @@
+UPDATE `devices_attribs` SET `attrib_type` = REPLACE(attrib_type, 'discover_cisco-vrf', 'discover_vrf');
				`@@ -0,0 +1 @@`
				UPDATE `devices_attribs` SET `attrib_type` = REPLACE(attrib_type, 'discover_cisco-vrf', 'discover_vrf');