Skip to content

Commit

Permalink
Update for 0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@xtophe38
xtophe38 committed Aug 26, 2020
1 parent 82a55fb commit 9595c30
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 61 deletions.
151 changes: 94 additions & 57 deletions teemip-ip-discovery/datamodel.teemip-ip-discovery.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,16 @@
<extkey_attcode>ipdiscovery_id</extkey_attcode>
<target_attcode>scan_cnx_refused_enabled</target_attcode>
</field>
<field id="last_discovery_date" xsi:type="AttributeDateTime" _delta="define">
<sql>last_discovery_date</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
<field id="ipdiscovery_enabled" xsi:type="AttributeEnum" _delta="define">
<sql>ipdiscovery_enabled</sql>
<values>
<value id="yes">yes</value>
<value id="no">no</value>
</values>
<default_value>no</default_value>
<is_null_allowed>false</is_null_allowed>
<display_style>radio_horizontal</display_style>
<dependencies/>
</field>
<field id="ping_enabled" xsi:type="AttributeEnum" _delta="define">
<sql>ping_enabled</sql>
Expand All @@ -429,12 +434,6 @@
<display_style>radio_horizontal</display_style>
<dependencies/>
</field>
<field id="ping_duration" xsi:type="AttributeDuration" _delta="define">
<sql>ping_duration</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="iplookup_enabled" xsi:type="AttributeEnum" _delta="define">
<sql>iplookup_enabled</sql>
<values>
Expand All @@ -446,12 +445,6 @@
<display_style>radio_horizontal</display_style>
<dependencies/>
</field>
<field id="iplookup_duration" xsi:type="AttributeDuration" _delta="define">
<sql>iplookup_duration</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="scan_enabled" xsi:type="AttributeEnum" _delta="define">
<sql>scan_enabled</sql>
<values>
Expand All @@ -463,12 +456,6 @@
<display_style>radio_horizontal</display_style>
<dependencies/>
</field>
<field id="scan_duration" xsi:type="AttributeDuration" _delta="define">
<sql>scan_duration</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="scan_cnx_refused_enabled" xsi:type="AttributeEnum" _delta="define">
<sql>scan_cnx_refused_enabled</sql>
<values>
Expand All @@ -480,16 +467,47 @@
<display_style>radio_horizontal</display_style>
<dependencies/>
</field>
<field id="ipdiscovery_enabled" xsi:type="AttributeEnum" _delta="define">
<sql>ipdiscovery_enabled</sql>
<values>
<value id="yes">yes</value>
<value id="no">no</value>
</values>
<default_value>no</default_value>
<is_null_allowed>false</is_null_allowed>
<display_style>radio_horizontal</display_style>
<dependencies/>
<field id="last_discovery_date" xsi:type="AttributeDateTime" _delta="define">
<sql>last_discovery_date</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="ping_duration" xsi:type="AttributeDuration" _delta="define">
<sql>ping_duration</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="ping_discovered" xsi:type="AttributeInteger" _delta="define">
<sql>ping_discovered</sql>
<default_value>0</default_value>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="iplookup_duration" xsi:type="AttributeDuration" _delta="define">
<sql>iplookup_duration</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="iplookup_discovered" xsi:type="AttributeInteger" _delta="define">
<sql>iplookup_discovered</sql>
<default_value>0</default_value>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="scan_duration" xsi:type="AttributeDuration" _delta="define">
<sql>scan_duration</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
<field id="scan_discovered" xsi:type="AttributeInteger" _delta="define">
<sql>scan_discovered</sql>
<default_value>0</default_value>
<is_null_allowed>true</is_null_allowed>
<tracking_level>none</tracking_level>
</field>
</fields>
<presentation>
Expand Down Expand Up @@ -522,57 +540,76 @@
<presentation>
<details _delta="must_exist">
<items>
<item id="col:col3" _delta="define">
<item id="col:col3" _delta="define">
<items>
<item id="fieldset:Class:IPSubnet:discoveryinfo" _delta="define">
<item id="fieldset:Class:IPSubnet:discoveryapp">
<items>
<item id="ipdiscovery_id">
<rank>10</rank>
</item>
<item id="ipdiscovery_enabled">
<item id="ipdiscovery_ping_enabled">
<rank>20</rank>
</item>
<item id="last_discovery_date" _delta="define">
<item id="ipdiscovery_iplookup_enabled">
<rank>30</rank>
</item>
<item id="ipdiscovery_ping_enabled">
<item id="ipdiscovery_scan_enabled">
<rank>40</rank>
</item>
<item id="ping_enabled">
<item id="ipdiscovery_scan_cnx_refused_enabled">
<rank>50</rank>
</item>
<item id="ping_duration">
<rank>60</rank>
</items>
<rank>10</rank>
</item>
<item id="fieldset:Class:IPSubnet:discoverysubnet">
<items>
<item id="ipdiscovery_enabled">
<rank>10</rank>
</item>
<item id="ipdiscovery_iplookup_enabled">
<rank>70</rank>
<item id="ping_enabled">
<rank>20</rank>
</item>
<item id="iplookup_enabled">
<rank>80</rank>
<rank>30</rank>
</item>
<item id="iplookup_duration">
<rank>90</rank>
<item id="scan_enabled">
<rank>40</rank>
</item>
<item id="ipdiscovery_scan_enabled">
<rank>100</rank>
<item id="scan_cnx_refused_enabled">
<rank>50</rank>
</item>
<item id="scan_enabled">
<rank>110</rank>
</items>
<rank>20</rank>
</item>
<item id="fieldset:Class:IPSubnet:discoverystats" >
<items>
<item id="last_discovery_date" _delta="define">
<rank>10</rank>
</item>
<item id="ipdiscovery_scan_cnx_refused_enabled">
<rank>120</rank>
<item id="ping_duration">
<rank>20</rank>
</item>
<item id="scan_cnx_refused_enabled">
<rank>130</rank>
<item id="ping_discovered">
<rank>30</rank>
</item>
<item id="iplookup_duration">
<rank>40</rank>
</item>
<item id="iplookup_discovered">
<rank>50</rank>
</item>
<item id="scan_duration">
<rank>140</rank>
<rank>60</rank>
</item>
<item id="scan_discovered">
<rank>70</rank>
</item>
</items>
<rank>20</rank>
<rank>30</rank>
</item>
</items>
<rank>20</rank>
<rank>30</rank>
</item>
</items>
</details>
Expand Down
5 changes: 4 additions & 1 deletion teemip-ip-discovery/de.dict.teemip-ip-discovery.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',

));

//
Expand Down
10 changes: 9 additions & 1 deletion teemip-ip-discovery/en.dict.teemip-ip-discovery.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
));

//
Expand Down
12 changes: 10 additions & 2 deletions teemip-ip-discovery/fr.dict.teemip-ip-discovery.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
));

//
Expand Down

0 comments on commit 9595c30

Please sign in to comment.