From 9595c30ea801e3c2ae4eeadbc7b532dedcc0d9d6 Mon Sep 17 00:00:00 2001
From: xtophe38 <13520055+xtophe38@users.noreply.github.com>
Date: Wed, 26 Aug 2020 09:23:56 +0200
Subject: [PATCH] Update for 0.6.0
---
.../datamodel.teemip-ip-discovery.xml | 151 +++++++++++-------
.../de.dict.teemip-ip-discovery.php | 5 +-
.../en.dict.teemip-ip-discovery.php | 10 +-
.../fr.dict.teemip-ip-discovery.php | 12 +-
4 files changed, 117 insertions(+), 61 deletions(-)
diff --git a/teemip-ip-discovery/datamodel.teemip-ip-discovery.xml b/teemip-ip-discovery/datamodel.teemip-ip-discovery.xml
index 39e9660..36e9c93 100755
--- a/teemip-ip-discovery/datamodel.teemip-ip-discovery.xml
+++ b/teemip-ip-discovery/datamodel.teemip-ip-discovery.xml
@@ -412,11 +412,16 @@
ipdiscovery_id
scan_cnx_refused_enabled
-
- last_discovery_date
-
- true
- none
+
+ ipdiscovery_enabled
+
+ yes
+ no
+
+ no
+ false
+ radio_horizontal
+
ping_enabled
@@ -429,12 +434,6 @@
radio_horizontal
-
- ping_duration
-
- true
- none
-
iplookup_enabled
@@ -446,12 +445,6 @@
radio_horizontal
-
- iplookup_duration
-
- true
- none
-
scan_enabled
@@ -463,12 +456,6 @@
radio_horizontal
-
- scan_duration
-
- true
- none
-
scan_cnx_refused_enabled
@@ -480,16 +467,47 @@
radio_horizontal
-
- ipdiscovery_enabled
-
- yes
- no
-
- no
- false
- radio_horizontal
-
+
+ last_discovery_date
+
+ true
+ none
+
+
+ ping_duration
+
+ true
+ none
+
+
+ ping_discovered
+ 0
+ true
+ none
+
+
+ iplookup_duration
+
+ true
+ none
+
+
+ iplookup_discovered
+ 0
+ true
+ none
+
+
+ scan_duration
+
+ true
+ none
+
+
+ scan_discovered
+ 0
+ true
+ none
@@ -522,57 +540,76 @@
- -
+
-
-
-
+
-
-
10
- -
+
-
20
- -
+
-
30
- -
+
-
40
- -
+
-
50
- -
- 60
+
+ 10
+
+ -
+
+
-
+ 10
- -
- 70
+
-
+ 20
-
- 80
+ 30
- -
- 90
+
-
+ 40
- -
- 100
+
-
+ 50
- -
- 110
+
+ 20
+
+ -
+
+
-
+ 10
- -
- 120
+
-
+ 20
- -
- 130
+
-
+ 30
+
+ -
+ 40
+
+ -
+ 50
-
- 140
+ 60
+
+ -
+ 70
- 20
+ 30
- 20
+ 30
diff --git a/teemip-ip-discovery/de.dict.teemip-ip-discovery.php b/teemip-ip-discovery/de.dict.teemip-ip-discovery.php
index 3192d2e..7c39955 100755
--- a/teemip-ip-discovery/de.dict.teemip-ip-discovery.php
+++ b/teemip-ip-discovery/de.dict.teemip-ip-discovery.php
@@ -120,7 +120,10 @@
'Class:IPSubnet/Attribute:iplookup_duration+' => 'Zeit, die benötigt wurde, um eine IP-Auflösung für alle IPs im Subnetz durchzuführen',
'Class:IPSubnet/Attribute:scan_duration' => 'Dauer der IP-Scan',
'Class:IPSubnet/Attribute:scan_duration+' => 'Zeit, die benötigt wurde, um alle IP-Adressen im Subnetz zu scan',
- 'Class:IPSubnet:discoveryinfo' => 'Entdeckung informationen',
+ 'Class:IPSubnet:discoveryapp' => 'Entdeckung: Anwendungseinstellungen',
+ 'Class:IPSubnet:discoverysubnet' => 'Entdeckung: Subnetzeinstellungen',
+ 'Class:IPSubnet:discoverystats' => 'Entdeckung: Statistiken',
+
));
//
diff --git a/teemip-ip-discovery/en.dict.teemip-ip-discovery.php b/teemip-ip-discovery/en.dict.teemip-ip-discovery.php
index 616465e..4847f5e 100755
--- a/teemip-ip-discovery/en.dict.teemip-ip-discovery.php
+++ b/teemip-ip-discovery/en.dict.teemip-ip-discovery.php
@@ -120,11 +120,19 @@
'Class:IPSubnet/Attribute:iplookup_duration+' => 'Time it took for the last discovery to IP lookup the subnet',
'Class:IPSubnet/Attribute:scan_duration' => 'Scan duration',
'Class:IPSubnet/Attribute:scan_duration+' => 'Time it took for the last discovery to scan the subnet',
+ 'Class:IPSubnet/Attribute:ping_discovered' => 'Ping #',
+ 'Class:IPSubnet/Attribute:ping_discovered+' => 'Number of IPs discovered by ping',
+ 'Class:IPSubnet/Attribute:iplookup_discovered' => 'IP lookup #',
+ 'Class:IPSubnet/Attribute:iplookup_discovered+' => 'Number of IPs discovered by IP lookup',
+ 'Class:IPSubnet/Attribute:scan_discovered' => 'Scan #',
+ 'Class:IPSubnet/Attribute:scan_discovered+' => 'Number of IPs discovered by scan',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled' => 'Consider scan "connection refused" as valid',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled+' => '',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled/Value:yes' => 'Yes',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled/Value:no' => 'No',
- 'Class:IPSubnet:discoveryinfo' => 'Discovery Information',
+ 'Class:IPSubnet:discoveryapp' => 'Discovery: application parameters',
+ 'Class:IPSubnet:discoverysubnet' => 'Discovery: subnet parameters',
+ 'Class:IPSubnet:discoverystats' => 'Discovery: statistics',
));
//
diff --git a/teemip-ip-discovery/fr.dict.teemip-ip-discovery.php b/teemip-ip-discovery/fr.dict.teemip-ip-discovery.php
index 4c4a953..c232f2e 100755
--- a/teemip-ip-discovery/fr.dict.teemip-ip-discovery.php
+++ b/teemip-ip-discovery/fr.dict.teemip-ip-discovery.php
@@ -116,15 +116,23 @@
'Class:IPSubnet/Attribute:scan_enabled/Value:no' => 'Non',
'Class:IPSubnet/Attribute:ping_duration' => 'Durée du ping',
'Class:IPSubnet/Attribute:ping_duration+' => 'Temps qu\'il a fallu pour \'pinger\' toutes les IPs du sous-réseau',
- 'Class:IPSubnet/Attribute:iplookup_duration' => 'Durée del\'IP lookup',
+ 'Class:IPSubnet/Attribute:iplookup_duration' => 'Durée de l\'IP lookup',
'Class:IPSubnet/Attribute:iplookup_duration+' => 'Temps qu\'il a fallu pour faire un IP Lookup sur toutes les IPs du sous-réseau',
'Class:IPSubnet/Attribute:scan_duration' => 'Durée du scan',
'Class:IPSubnet/Attribute:scan_duration+' => 'Temps qu\'il a fallu pour \'scaner\' toutes les IPs du sous-réseau',
+ 'Class:IPSubnet/Attribute:ping_discovered' => 'Ping #',
+ 'Class:IPSubnet/Attribute:ping_discovered+' => 'Nombre d\'IPs découvertes par ping',
+ 'Class:IPSubnet/Attribute:iplookup_discovered' => 'IP lookup #',
+ 'Class:IPSubnet/Attribute:iplookup_discovered+' => 'Nombre d\'IPs découvertes par IP lookup',
+ 'Class:IPSubnet/Attribute:scan_discovered' => 'Scan #',
+ 'Class:IPSubnet/Attribute:scan_discovered+' => 'Nombre d\'IPs découvertes par scan',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled' => 'Considère les scan "connexion refusée" comme valides',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled+' => '',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled/Value:yes' => 'Oui',
'Class:IPSubnet/Attribute:scan_cnx_refused_enabled/Value:no' => 'Non',
- 'Class:IPSubnet:discoveryinfo' => 'Informations de découverte',
+ 'Class:IPSubnet:discoveryapp' => 'Découverte: paramètres de l\'application',
+ 'Class:IPSubnet:discoverysubnet' => 'Découverte: paramètres du sous-réseau',
+ 'Class:IPSubnet:discoverystats' => 'Découverte: statistiques',
));
//