add: change nagios settings from ip-list

add: change acl settings for ip from ip list
wiki: upload last version of includes

docs/wiki/fix_wiki_perm

@@ -1,7 +1,20 @@
 #!/bin/bash
 
-exit
+function fix_perm() {
+fix_dir=$1
+user=$2
+[ -z "${user}" ] && user=apache
+[ -z "${fix_dir}" ] && return
+[ "x${fix_dir}" == "x/" ] && return
+[ ! -e "${fix_dir}" ] && return
+
+echo "Fix permissions for ${fix_dir}"
+chown ${user}:${user} -R "${fix_dir}"
+find "${fix_dir}" -type d -exec chmod 770 {} \;
+find "${fix_dir}" -type f -exec chmod 660 {} \;
+echo "Done"
+}
 
-chown apache:apache -R /var/www/foswiki/
+fix_perm "/var/www/foswiki/data" apache
 
 exit

docs/wiki/foswiki/ShowStatPlugin.pm

@@ -9,7 +9,7 @@ use Data::Dumper;
 
 # $VERSION is referred to by Foswiki, and is the only global variable that
 # *must* exist in this package
-use vars qw( $VERSION $RELEASE $debug $dbstat $dbcacti $pluginName );
+use vars qw( $VERSION $RELEASE $debug $dbstat $dbrstat $dbcacti $pluginName );
 
 use Foswiki::Func    ();    # The plugins API
 use Foswiki::Plugins ();    # For the API version
@@ -67,11 +67,12 @@ sub initPlugin {
     if ( $Foswiki::cfg{Plugins}{DatabasePlugin}{ConfigSource} eq 'Local' ) {
         foreach  my $info ( @{ $Foswiki::cfg{Plugins}{DatabasePlugin}{Databases} } ) {
             if ($info->{description} eq "stat") { $dbstat = $info; next; }
+            if ($info->{description} eq "rstat") { $dbrstat = $info; next; }
             if ($info->{description} eq "cacti") { $dbcacti = $info; next; }
             }
       }
 
-    return 0 if (!$dbstat);
+    return 0 if (!$dbstat or !$dbrstat);
 
     # register the _EXAMPLETAG function to handle %EXAMPLETAG{...}%
     Foswiki::Func::registerTagHandler( 'SHOWSTAT', \&_ShowStat );
@@ -101,6 +102,12 @@ my $connect_options = "dbi:$dbstat->{driver}:database=$dbstat->{database};host=$
 my $connect_user = "$dbstat->{username}";
 my $connect_password = "$dbstat->{password}";
 
+if ($theWeb=~/Internet/) {
+    $connect_options = "dbi:$dbrstat->{driver}:database=$dbrstat->{database};host=$dbrstat->{hostname}";
+    $connect_user = "$dbrstat->{username}";
+    $connect_password = "$dbrstat->{password}";
+    }
+
 my $dbh = DBI->connect($connect_options,$connect_user,$connect_password);
 
 my $SQL = "SELECT A.id, A.ip, A.mac, L.login, A.nagios, A.dhcp_hostname, A.enabled, G.group_name, Q.queue_name,
@@ -130,17 +137,18 @@ if ($res) {
     my $stat_url;
     if ($stat_row) { $stat_url = $stat_row->{value}."/admin/users/editauth.php?id=".$res->{id}; }
 
-    $status.='<div style="margin: 0 auto;">';
-    $status.='<div style="float: left;">';
-    $status.='Ссылки на внешние ресурсы<br>';
-    $status.='<a href="'.$nagios_url.'">Nagios</a><br>' if ($nagios_url and $res->{nagios});
-    $status.='<a href="'.$stat_url.'">Stat</a><br>' if ($stat_url);
-
-    $status.='</div>';
-    $status.='<div style="float: right; width: 200px;">';
-    $status.='Login: '.$res->{login}.'<br>';
+    $status ='<div style="float: right; width: 200px;">';
+    $status.='%BLUE%STAT:%ENDCOLOR%<br>';
+    $status.='id: '.$res->{id}.'<br>';
+    if ($stat_url) {
+        $status.='Login: <a href="'.$stat_url.'">'.$res->{login}.'</a><br>';
+        } else { $status.='Login: '.$res->{login}.'<br>'; }
     if ($res->{enabled}) { $status.='Включен: Да<br>'; } else { $status.='Включен: Нет<br>'; }
-    if ($res->{nagios}) { $status.='Nagios: Да<br>'; } else { $status.='Nagios: Нет<br>'; }
+    if ($res->{nagios}) {
+        if ($nagios_url) {
+            $status.='Nagios: <a href="'.$nagios_url.'">Да</a><br>';
+            } else { $status.='Nagios: Да<br>'; }
+        } else { $status.='Nagios: Нет<br>'; }
     $status.='Dhcp hostname: '.$res->{dhcp_hostname}.'<br>' if ($res->{dhcp_hostname});
     $status.='Фильтр: '.$res->{group_name}.'<br>';
     $status.='Шейпер: '.$res->{queue_name}.'<br>';

docs/wiki/foswiki/StatSyncPlugin.pm

@@ -9,7 +9,7 @@ use Data::Dumper;
 
 # $VERSION is referred to by Foswiki, and is the only global variable that
 # *must* exist in this package
-use vars qw( $VERSION $RELEASE $debug $dbstat $wiki_user $pluginName );
+use vars qw( $VERSION $RELEASE $debug $dbstat $dbrstat $wiki_user $pluginName );
 
 use Foswiki::Func    ();    # The plugins API
 use Foswiki::Plugins ();    # For the API version
@@ -72,10 +72,11 @@ sub initPlugin {
 #            $dbstat = $info;
 #            last;
             if ($info->{description} eq "stat") { $dbstat = $info; next; }
+            if ($info->{description} eq "rstat") { $dbrstat = $info; next; }
             }
       }
 
-    return 0 if (!$dbstat);
+    return 0 if (!$dbstat or !$dbrstat);
 
     # register the _EXAMPLETAG function to handle %EXAMPLETAG{...}%
     Foswiki::Func::registerTagHandler( 'STATSYNC', \&_STATSYNC );
@@ -209,6 +210,12 @@ my $connect_options = "dbi:$dbstat->{driver}:database=$dbstat->{database};host=$
 my $connect_user = "$dbstat->{username}";
 my $connect_password = "$dbstat->{password}";
 
+if ($theWeb=~/Internet/) {
+    $connect_options = "dbi:$dbrstat->{driver}:database=$dbrstat->{database};host=$dbrstat->{hostname}";
+    $connect_user = "$dbrstat->{username}";
+    $connect_password = "$dbrstat->{password}";
+    }
+
 my $dbh = DBI->connect($connect_options,$connect_user,$connect_password);
 
 eval {

docs/wiki/foswiki/SwitchInfoPlugin.pm

@@ -134,6 +134,8 @@ foreach my $port (sort {$a <=> $b} keys %$device) {
 return $ret;
 };
 
+##########################################################
+
 sub table_callback {
 my ($session, $OID_ifTable, $table) = @_;
 
@@ -157,6 +159,8 @@ if (!defined $result) { printf "ERROR: %s.\n", $session->error(); }
 return;
 }
 
+###########################################################
+
 sub _SWITCHINFO {
 my($session, $params, $theTopic, $theWeb) = @_;
 
@@ -331,6 +335,8 @@ for (my $index=0; $index<scalar(@keys); $index++)  {
 	next if ($value=~/^MEth/);
 	next if ($value=~/^bridge/i);
 	next if ($value=~/^ppp/i);
+	next if ($value=~/^rtif\(/i);
+	
         $switch_status{$num}->{num}=$value;
 	}
     $switch_status{$num}->{$key}=$value;

docs/wiki/foswiki/data/DefaultATSTemplate.txt

@@ -1,26 +1,11 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeFindATSPhoneList}%
+%INCLUDE{IncludeHeaderAts}%
 
-%INCLUDE{IncludeNetDevCommon}%
-
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomAts}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
 %META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup, VoipAdminsGroup"}%

docs/wiki/foswiki/data/DefaultAirCondTemplate.txt

@@ -1,6 +1,6 @@
 ---+!! Кондиционер
 
-%INCLUDE{IncludeImage}%
+%INCLUDE{IncludeWorkflow}%
 
 -- %WIKIUSERNAME% - %DATE%
 

docs/wiki/foswiki/data/DefaultBrasTemplate.txt

@@ -4,19 +4,16 @@
 
 ---++ Сервер доступа
 
+%INCLUDE{IncludeHeaderBras}%
+
 ---++ Маршрутизация
 
 ---++ Политика безопасности
 
-%INCLUDE{IncludeHeaderBras}%
+%INCLUDE{IncludeBottomBras}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
 %META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultBuildingTemplate.txt

@@ -2,15 +2,10 @@
 
 %INCLUDE{IncludeHeaderBuilding}%
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomBuilding}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormBuilding"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultCPOTemplate.txt

@@ -8,6 +8,8 @@
 
 %INCLUDE{IncludeNetDevCommon}%
 
+%INCLUDE{IncludeWorkflow}%
+
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
 %META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultDnsZoneTemplate.txt

@@ -1,15 +1,6 @@
 ---+!! Зона %FORMFIELD{"DnsZoneName" topic="%BASETOPIC%"}%
 
-Поднята на серверах:
-
-%SEARCH{
-"%FORMFIELD{"Name" topic="%BASETOPIC%"}%"
-topic="ServiceDns*"
-type="regexp"
-nonoise="on"
-format="* [[$topic][$formfield(Name)]] - $formfield(Description)"
-separator="<br>"
-}%
+%INCLUDE{IncludeFindDnsZone}%
 
 %INCLUDE{IncludeWorkflow}%
 

docs/wiki/foswiki/data/DefaultDomainTemplate.txt

@@ -1,14 +1,8 @@
 ---+!! Домен %FORMFIELD{"Name" topic="%BASETOPIC%"}%
 
-%SEARCH{
-"parent.name='%BASETOPIC%'"
-type="query"
-nosearch="on"
-nototal="on"
-topic="DnsZone*"
-header="| *Название* | *Домен* |  *Комментарий* |"
-format="| [[$topic][$formfield(DnsZoneName)]] | $formfield(DomainName) | $formfield(Description) |"
-}%
+%INCLUDE{IncludeFindDomain}%
+
+---++ Добавить 
 
 %INCLUDE{IncludeAddDnsZone}%
 

docs/wiki/foswiki/data/DefaultEquipmentHddTemplate.txt

@@ -0,0 +1 @@
+---+!!  %FORMFIELD{"EquipmentType" topic="%BASETOPIC%"}% AT %FORMFIELD{"Parent" topic="%BASETOPIC%"}%

docs/wiki/foswiki/data/DefaultEsxiTemplate.txt

@@ -4,15 +4,19 @@
 
 %INCLUDE{IncludeShowStat}%
 
+---++ Система
+
 ОС:
 
 ---++ Дисковая подсистема
 
 ---++ Сеть
 
----++ Работа
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeShowServer}%
 
-%COMMENT{type="workflow"}%
+%INCLUDE{IncludeWorkflow}%
 
 -- Main.RomanDmitriev - 2020/10/14
 

docs/wiki/foswiki/data/DefaultGatewayTemplate.txt

@@ -4,6 +4,9 @@
 
 %TOC%
 
+
+%INCLUDE{IncludeHeaderGateway}%
+
 ---++ WAN
 
    * wan-port: dhcp
@@ -14,15 +17,10 @@
 
 ---++ Политика безопасности
 
-%INCLUDE{IncludeHeaderGateway}%
+%INCLUDE{IncludeBottomGateway}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultHardwareTemplate.txt

@@ -7,39 +7,17 @@
 
 | *Type* | *MHz* | *Model* | *Vendor* | *SN* | *Size* |
 
----+++ Диски
-
-| *Id* | *FormFactor* | *Family* | *Type* | *Model* | *Size* | *SN* | *Date* |
-
----++++ Диски на рэйд-контроллере:
-
-| *SLOT* | *Type* | *Model* | *SN* | *WWN* | *Logical Drv* | *Size* | *Date* |
+%INCLUDE{IncludeHeaderHardware}%
 
 ---+++ Логические тома
 
 | *Name* | *Id* | *mount point* | *Description* |
 
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddServer}%
 
-%INCLUDE{IncludeAddKvmHost}%
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomHardware}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
-%META:FORM{name="FormHardware"}%
-
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
 %META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultKvmHostTemplate.txt

@@ -1,20 +1,21 @@
 ---+!! Сервер %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
+%TOC%
+
+---++ Система
+
 ОС:
 
+%INCLUDE{IncludeHeaderKvmServer}%
+
 ---++ Дисковая подсистема
 
 ---++ Сеть
 
-%INCLUDE{IncludeHeaderKvmServer}%
+%INCLUDE{IncludeBottomKvmServer}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormServerOs"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultNetdeviceTemplate.txt

@@ -2,29 +2,12 @@
 
 %TOC%
 
-%INCLUDE{IncludeNetDevCommon}%
+%INCLUDE{IncludeHeaderNetDev}%
 
-%INCLUDE{IncludeFindCerts}%
-
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddCert}%
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomNetDev}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultPhoneTemplate.txt

@@ -1,24 +1,11 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeNetDevCommon}%
+%INCLUDE{IncludeHeaderPhone}%
 
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomPhone}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
 
 %META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%

docs/wiki/foswiki/data/DefaultPoolTemplate.txt

@@ -2,16 +2,10 @@
 
 %INCLUDE{IncludeHeaderDhcpPool}%
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomDhcpPool}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormDhcpPool"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultRackTemplate.txt

@@ -2,15 +2,10 @@
 
 %INCLUDE{IncludeHeaderRack}%
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomRack}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormRack"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultRoomTemplate.txt

@@ -4,15 +4,10 @@
 
 %INCLUDE{IncludeHeaderRoom}%
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomRoom}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormRoom"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultRouterTemplate.txt

@@ -4,21 +4,18 @@
 
 %TOC%
 
+%INCLUDE{IncludeHeaderRouter}%
+
 ---++ DHCP Relay
 
 ---++ Маршрутизация
 
 ---++ Политика безопасности
 
-%INCLUDE{IncludeHeaderRouter}%
+%INCLUDE{IncludeBottomRouter}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultServerTemplate.txt

@@ -1,22 +1,21 @@
+---+!! Сервер %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
+
 %TOC%
 
----+!! Сервер %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
+---++ Система
 
 ОС:
 
+%INCLUDE{IncludeHeaderServer}%
+
 ---++ Дисковая подсистема
 
 ---++ Сеть
 
-%INCLUDE{IncludeHeaderServer}%
+%INCLUDE{IncludeBottomServer}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormServerOs"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultServiceTemplate.txt

@@ -1,11 +1,8 @@
 ---+!! Сервис %FORMFIELD{"Description" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeFindAuth}%
+%INCLUDE{IncludeHeaderService}%
 
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomService}%
 
 -- %WIKIUSERNAME% - %DATE%
 

docs/wiki/foswiki/data/DefaultSiteTemplate.txt

@@ -1,11 +1,8 @@
 ---+!! Сайт %FORMFIELD{"Httpproto" topic="%BASETOPIC%"}%://%FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeFindAuth}%
+%INCLUDE{IncludeHeaderService}%
 
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomService}%
 
 -- %WIKIUSERNAME% - %DATE%
 

docs/wiki/foswiki/data/DefaultSubnetTemplate.txt

@@ -2,15 +2,10 @@
 
 %INCLUDE{IncludeHeaderSubnet}%
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomSubnet}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormSubnet"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultSwitchTemplate.txt

@@ -4,22 +4,11 @@
 
 %INCLUDE{IncludeHeaderSwitch}%
 
-%INCLUDE{IncludeFindAuth}%
-
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomSwitch}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
-%META:FIELD{name="DeviceType" title="Device Type" value="Switch"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%

docs/wiki/foswiki/data/DefaultUpsTemplate.txt

@@ -2,12 +2,7 @@
 
 %INCLUDE{IncludeHeaderUps}%
 
-%INCLUDE{IncludeFindAuth}%
-
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomUps}%
 
 -- Main.RomanDmitriev - 01 Nov 2020
 

docs/wiki/foswiki/data/DefaultVideoRegTemplate.txt

@@ -2,18 +2,9 @@
 
 %TOC%
 
-%INCLUDE{IncludeFindCamList}%
+%INCLUDE{IncludeHeaderVideoReg}%
 
-%INCLUDE{IncludeNetDevCommon}%
-
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomVideoReg}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%

docs/wiki/foswiki/data/DefaultVirtCluster.txt

@@ -29,6 +29,4 @@ format="| $formfield(VmID) | [[$web.$topic][$formfield(DnsName)]] | $formfield(D
 
 %INCLUDE{IncludeAddVServerCluster}%
 
----++ Работа
-
-%COMMENT{type="workflow"}%
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/DefaultVirtualHostTemplate.txt

@@ -2,35 +2,20 @@
 
 %TOC%
 
----++ Описание
+---++ Система
 
 ОС:
 
----++ Дисковая подсистема
----++ Сеть
-
-%INCLUDE{IncludeShowVirtualServer}%
-
-%INCLUDE{IncludeNetDevCommon}%
+%INCLUDE{IncludeHeaderVirtualHost}%
 
----++ Добавить
+---++ Дисковая подсистема
 
-%INCLUDE{IncludeAddService}%
-%INCLUDE{IncludeAddServiceDns}%
-%INCLUDE{IncludeAddSite}%
-%INCLUDE{IncludeAddCert}%
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
+---++ Сеть
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomVirtualHost}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormVirtual"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultVoipGateTemplate.txt

@@ -1,26 +1,11 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeFindPhoneList}%
+%INCLUDE{IncludeHeaderVoipGate}%
 
-%INCLUDE{IncludeNetDevCommon}%
-
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeBottomVoipGate}%
 
 -- %WIKIUSERNAME% - %DATE%
 
-%STARTSECTION{type="templateonly"}%
-This topic is needed for normal operation even if System web is restricted.
-   * Set ALLOWTOPICVIEW = *
-%ENDSECTION{type="templateonly"}%
-
 %META:FORM{name="FormNetDevice"}%
 %META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup, VoipAdminsGroup"}%

docs/wiki/foswiki/data/DefaultWlcTemplate.txt

@@ -1,6 +1,6 @@
 ---+ Wireless Controller %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeShowStat}%
+%INCLUDE{IncludeHeaderNetDev}%
 
 ---++ Список клиентов (Huawei)
 
@@ -36,7 +36,7 @@ $(function() {
 });
 </script>
 
-%INCLUDE{IncludeHeaderNetDev}%
+%INCLUDE{IncludeBottomNetDev}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%

docs/wiki/foswiki/data/FormEquipmentHdd.txt

@@ -0,0 +1,33 @@
+%META:TOPICINFO{author="roman" comment="reprev" date="1604772215" format="1.1" reprev="1" version="7"}%
+---+ Basic info for HDD
+
+This is a topic, used for HDD
+
+---++ Data form definition
+
+| *Name*  | *Type* | *Size* | *Values* |
+| Name | text  | 80 | %BASETOPIC% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectHardware}% |
+| Description | text | 80 | |
+| System Name | text | 10 | |
+| Logical Volume | text | 10 | |
+| Mount | text | 40 | |
+| Slot | text | 10 | |
+| Equipment Type | text | 10 | %INCLUDE{IncludeSelectEquipmentType}% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectHddType}% |
+| Interface Type | select | 1 | SATA, SATA2, SATA3, SAS, SCSI, NVME, ATA, USB |
+| Form Factor | select | 1 | , 2.5, 3.5 |
+| Family | text | 80 | |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
+| Device Model | text | 80 | |
+| Size | text | 10 | |
+| Firmware | text | 100 | |
+| SN | text | 80 | |
+| WWN | text | 80 | |
+| Date Commissioning | date | | |
+| Last Check | date | | |
+| Last Age | text | 10 | |
+| Disabled | checkbox | 1 |  Yes |
+| Deleted | checkbox | 1 |  Yes |
+
+-- Main.RomanDmitriev - 2020/10/12

docs/wiki/foswiki/data/FormHardware.txt

@@ -28,7 +28,7 @@ This is a topic, used for create server hardware
 | Memory REG | checkbox | 1 | Yes |
 | Memory Freq | text | 10 | |
 | RAID | text | 80 | |
-| Hdd Type | select+multi+values | 4 | HDD SATA, HDD SAS, SSHD, SSD, SCSI |
+| Hdd Type | select+multi+values | 4 | %INCLUDE{IncludeSelectHddType}% |
 | Hdd Form Factor | select+multi+values | 2 | 2.5, 3.5 |
 | Disabled | checkbox | 1 |  Yes |
 | Deleted | checkbox | 1 |  Yes |

docs/wiki/foswiki/data/IncludeAddEquipmentHdd.txt

@@ -0,0 +1,11 @@
+<form name="newHdd" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%"}%/">
+   * Добавить диск:
+     <input type="text" name="topic" value="EquipmentHdd" size="40" />
+     <input type="hidden" name="templatetopic" value="DefaultEquipmentHddTemplate" />
+     <input type="hidden" name="onlywikiname" value="off" />
+     <input type="hidden" name="topicparent" value="%BASETOPIC%" />
+     <input type="hidden" name="formtemplate" value="FormEquipmentHdd" />
+     <input type="hidden" name="EquipmentType" value="HDD" />
+     <input type="hidden" name="Parent" value="%BASETOPIC%" />
+     <input type="submit" value="Create" />
+</form>

docs/wiki/foswiki/data/IncludeAddSwitch.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormNetDevice" />
+     <input type="hidden" name="DeviceType" value="Switch" />
      <input type="submit" value="Create" />
 </form>

docs/wiki/foswiki/data/IncludeBottomAts.txt

@@ -0,0 +1,7 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomBras.txt

@@ -0,0 +1,7 @@
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomBuilding.txt

@@ -0,0 +1,5 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddRoom}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomClav.txt

@@ -0,0 +1,11 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddRack}%
+
+%INCLUDE{IncludeAddHardware}%
+%INCLUDE{IncludeAddSwitch}%
+%INCLUDE{IncludeAddRouter}%
+%INCLUDE{IncludeAddGateway}%
+%INCLUDE{IncludeAddUps}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomDhcpPool.txt

@@ -0,0 +1 @@
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomGateway.txt

@@ -0,0 +1,15 @@
+%INCLUDE{IncludeSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddService}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeAddVlan}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomHardware.txt

@@ -0,0 +1,11 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddEquipmentHdd}%
+
+%INCLUDE{IncludeAddServer}%
+
+%INCLUDE{IncludeAddKvmHost}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomKvmServer.txt

@@ -0,0 +1,17 @@
+%INCLUDE{IncludeFindVms}%
+
+%INCLUDE{IncludeShowServer}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddVServer}%
+%INCLUDE{IncludeAddService}%
+%INCLUDE{IncludeAddServiceDns}%
+%INCLUDE{IncludeAddSite}%
+%INCLUDE{IncludeAddCert}%
+%INCLUDE{IncludeAddAuth}%
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomNetDev.txt

@@ -0,0 +1,9 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddCert}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomPhone.txt

@@ -0,0 +1,7 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomRack.txt

@@ -0,0 +1,9 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddHardware}%
+%INCLUDE{IncludeAddSwitch}%
+%INCLUDE{IncludeAddRouter}%
+%INCLUDE{IncludeAddGateway}%
+%INCLUDE{IncludeAddUps}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomRoom.txt

@@ -0,0 +1,11 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddRack}%
+
+%INCLUDE{IncludeAddHardware}%
+%INCLUDE{IncludeAddSwitch}%
+%INCLUDE{IncludeAddRouter}%
+%INCLUDE{IncludeAddGateway}%
+%INCLUDE{IncludeAddUps}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomRouter.txt

@@ -0,0 +1,17 @@
+%INCLUDE{IncludeSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddService}%
+
+%INCLUDE{IncludeAddCert}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeAddVlan}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomServer.txt

@@ -0,0 +1,19 @@
+%INCLUDE{IncludeShowServer}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddService}%
+
+%INCLUDE{IncludeAddServiceDns}%
+
+%INCLUDE{IncludeAddSite}%
+
+%INCLUDE{IncludeAddCert}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomService.txt

@@ -0,0 +1 @@
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomSubnet.txt

@@ -0,0 +1,5 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddPool}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomSwitch.txt

@@ -0,0 +1,11 @@
+%INCLUDE{IncludeSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomUps.txt

@@ -0,0 +1,9 @@
+%INCLUDE{IncludeFindAuth}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomVideoReg.txt

@@ -0,0 +1,7 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomVirtualHost.txt

@@ -0,0 +1,19 @@
+%INCLUDE{IncludeShowVirtualServer}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddService}%
+
+%INCLUDE{IncludeAddServiceDns}%
+
+%INCLUDE{IncludeAddSite}%
+
+%INCLUDE{IncludeAddCert}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeBottomVoipGate.txt

@@ -0,0 +1,7 @@
+---++ Добавить
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeFindBuildingDevices.txt

@@ -0,0 +1,14 @@
+---++ Список оборудования в здании вне стоек
+
+%SEARCH{
+"(Place='%BASETOPIC%' or Parent='%BASETOPIC%') and not Rack"
+topic="*"
+excludetopic="Rack*,Room*,Building*"
+web="Sovtest,Internet"
+type="query"
+nosearch="on"
+nototal="on"
+header="|*Name*|*Место*|*Model*|*Description*|"
+format="| [[$web.$topic][$formfield(Name)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+order="formfield(Name)"
+}%

docs/wiki/foswiki/data/IncludeFindDnsZone.txt

@@ -0,0 +1,10 @@
+---++ Поднята на серверах
+
+%SEARCH{
+"%FORMFIELD{"Name" topic="%BASETOPIC%"}%"
+topic="ServiceDns*"
+type="regexp"
+nonoise="on"
+format="* [[$topic][$formfield(Name)]] - $formfield(Description)"
+separator="<br>"
+}%

docs/wiki/foswiki/data/IncludeFindDomain.txt

@@ -0,0 +1,9 @@
+%SEARCH{
+"parent.name='%BASETOPIC%'"
+type="query"
+nosearch="on"
+nototal="on"
+topic="DnsZone*"
+header="| *Название* | *Домен* |  *Комментарий* |"
+format="| [[$topic][$formfield(DnsZoneName)]] | $formfield(DomainName) | $formfield(Description) |"
+}%

docs/wiki/foswiki/data/IncludeFindEquipmentHdd.txt

@@ -0,0 +1,12 @@
+---++ Список жёстких дисков
+
+%SEARCH{
+"Parent='%BASETOPIC%' and EquipmentType='HDD' and Disabled='' and Deleted=''"
+topic="Equipment*"
+type="query"
+nosearch="on"
+expandvariables="on"
+header="|*Name*|*Sys/LogVol*|*DevType*|*Interface*|*FormFactor*|*Vendor*|*Model*|*Size*|*SN*|*Date*|*Description*|"
+format="| [[$topic][$formfield(Name)]] | $formfield(SystemName) $formfield(LogicalVolume) | $formfield(DeviceType) | $formfield(InterfaceType) | $formfield(FormFactor) | $formfield(Vendor) | $formfield(DeviceModel) | $formfield(Size) | $formfield(SN) | $formfield(DateCommissioning) | $formfield(Description) |"
+order="formfield(Name)"
+}%

docs/wiki/foswiki/data/IncludeFindPhonesDisabled.txt

@@ -5,6 +5,6 @@
 topic="DevicePhone*"
 type="query"
 nosearch="on"
-header="|*Name*|*Model*|*Комментарий*|"
-format="| [[$topic][$formfield(Name)]] | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+header="|*Name*|*Model*|*IP*|*Комментарий*|"
+format="| [[$topic][$formfield(Name)]] | $formfield(Vendor) $formfield(DeviceModel) | $formfield(DeviceIP) | $formfield(Description) |"
 }%

docs/wiki/foswiki/data/IncludeFindRackDevices.txt

@@ -3,12 +3,13 @@
 %SEARCH{
 "Rack='%BASETOPIC%' or Parent='%BASETOPIC%' or Place='%BASETOPIC%'"
 topic="*"
+web="Sovtest,Internet"
 excludetopic="Rack*"
 type="query"
 nosearch="on"
 nototal="on"
 expandvariables="on"
 header="|*Name*|*Тип*|*Description*|"
-format="| [[$topic][$formfield(DnsName)]] | $formfield(DeviceType) | $formfield(Description) |"
+format="| [[$web.$topic][$formfield(DnsName)]] | $formfield(DeviceType) | $formfield(Description) |"
 order="formfield(Name)"
 }%

docs/wiki/foswiki/data/IncludeFindRoomDevices.txt

@@ -1,13 +1,14 @@
 ---++ Список оборудования вне стоек
 
 %SEARCH{
-"Place='%BASETOPIC%' or Parent='%BASETOPIC%'"
+"(Place='%BASETOPIC%' or Parent='%BASETOPIC%') and not Rack"
 topic="*"
 excludetopic="Rack*"
+web="Sovtest,Internet"
 type="query"
 nosearch="on"
 nototal="on"
 header="|*Name*|*Место*|*Model*|*Description*|"
-format="| [[$topic][$formfield(DnsName)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+format="| [[$web.$topic][$formfield(Name)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
 order="formfield(Name)"
 }%

docs/wiki/foswiki/data/IncludeFindVoipGatesDisabled.txt

@@ -5,6 +5,6 @@
 topic="DeviceVoipGate*"
 type="query"
 nosearch="on"
-header="|*Name*|*Model*|*Комментарий*|"
-format="| [[$topic][$formfield(Name)]] | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+header="|*Name*|*Model*|*IP*|*Комментарий*|"
+format="| [[$topic][$formfield(Name)]] | $formfield(Vendor) $formfield(DeviceModel) | $formfield(DeviceIP) | $formfield(Description) |"
 }%

docs/wiki/foswiki/data/IncludeHeaderAts.txt

@@ -0,0 +1,7 @@
+%INCLUDE{IncludeShowStat}%
+
+%INCLUDE{IncludeFindATSPhoneList}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeHeaderBras.txt

@@ -1,5 +1 @@
-%INCLUDE{IncludeNetDevCommon}%
-
-%INCLUDE{IncludeHeaderSnmpPort}%
-
-%INCLUDE{IncludeFindAuth}%
+%INCLUDE{IncludeShowStat}%

docs/wiki/foswiki/data/IncludeHeaderBuilding.txt

@@ -1,7 +1,3 @@
-
 %INCLUDE{IncludeFindRooms}%
 
----++ Добавить
-
-%INCLUDE{IncludeAddRoom}%
-
+%INCLUDE{IncludeFindBuildingDevices}%

docs/wiki/foswiki/data/IncludeHeaderClav.txt

@@ -1,15 +1,3 @@
 %INCLUDE{IncludeFindRacks}%
 
 %INCLUDE{IncludeFindRoomDevices}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddRack}%
-
-%INCLUDE{IncludeAddHardware}%
-%INCLUDE{IncludeAddSwitch}%
-%INCLUDE{IncludeAddRouter}%
-%INCLUDE{IncludeAddGateway}%
-%INCLUDE{IncludeAddUps}%
-
-%INCLUDE{IncludeImage}%

docs/wiki/foswiki/data/IncludeHeaderGateway.txt

@@ -1,22 +1,7 @@
+%INCLUDE{IncludeShowStat}%
+
 %INCLUDE{IncludeFindSubnets}%
 
 %INCLUDE{IncludeFindServices}%
 
 %INCLUDE{IncludeFindVlans}%
-
-%INCLUDE{IncludeHeaderSnmpPort}%
-
-%INCLUDE{IncludeFindAuth}%
-
-
----++ Добавить
-
-%INCLUDE{IncludeAddService}%
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeAddVlan}%
-
-%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeHeaderHardware.txt

@@ -0,0 +1,3 @@
+%INCLUDE{IncludeFindEquipmentHdd}%
+
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeHeaderKvmServer.txt

@@ -1,18 +1 @@
-%INCLUDE{IncludeFindVms}%
-
-%INCLUDE{IncludeShowServer}%
-
-%INCLUDE{IncludeNetDevCommon}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddVServer}%
-%INCLUDE{IncludeAddService}%
-%INCLUDE{IncludeAddServiceDns}%
-%INCLUDE{IncludeAddSite}%
-%INCLUDE{IncludeAddCert}%
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
-
+%INCLUDE{IncludeShowStat}%

docs/wiki/foswiki/data/IncludeHeaderNetDev.txt

@@ -1,10 +1,7 @@
-%INCLUDE{IncludeNetDevCommon}%
-
-%INCLUDE{IncludeFindAuth}%
+%INCLUDE{IncludeShowStat}%
 
----++ Добавить
+%INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
+%INCLUDE{IncludeFindCerts}%
 
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeHeaderPhone.txt

@@ -0,0 +1,6 @@
+%INCLUDE{IncludeShowStat}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeFindAuth}%
+

docs/wiki/foswiki/data/IncludeHeaderRack.txt

@@ -1,15 +1 @@
 %INCLUDE{IncludeFindRackDevices}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddHardware}%
-%INCLUDE{IncludeAddSwitch}%
-%INCLUDE{IncludeAddRouter}%
-%INCLUDE{IncludeAddGateway}%
-%INCLUDE{IncludeAddUps}%
-
-
-
-
-
-

docs/wiki/foswiki/data/IncludeHeaderRoom.txt

@@ -1,15 +1,3 @@
 %INCLUDE{IncludeFindRacks}%
 
 %INCLUDE{IncludeFindRoomDevices}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddRack}%
-
-%INCLUDE{IncludeAddHardware}%
-%INCLUDE{IncludeAddSwitch}%
-%INCLUDE{IncludeAddRouter}%
-%INCLUDE{IncludeAddGateway}%
-%INCLUDE{IncludeAddUps}%
-
-%INCLUDE{IncludeImage}%

docs/wiki/foswiki/data/IncludeHeaderRouter.txt

@@ -1,23 +1,7 @@
+%INCLUDE{IncludeShowStat}%
+
 %INCLUDE{IncludeFindSubnets}%
 
 %INCLUDE{IncludeFindServices}%
 
 %INCLUDE{IncludeFindVlans}%
-
-%INCLUDE{IncludeHeaderSnmpPort}%
-
-%INCLUDE{IncludeFindAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddService}%
-
-%INCLUDE{IncludeAddCert}%
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeAddVlan}%
-
-%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeHeaderServer.txt

@@ -1,14 +1 @@
-%INCLUDE{IncludeShowServer}%
-
-%INCLUDE{IncludeNetDevCommon}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddService}%
-%INCLUDE{IncludeAddServiceDns}%
-%INCLUDE{IncludeAddSite}%
-%INCLUDE{IncludeAddCert}%
-%INCLUDE{IncludeAddAuth}%
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeWorkflow}%
+%INCLUDE{IncludeShowStat}%

docs/wiki/foswiki/data/IncludeHeaderService.txt

@@ -0,0 +1,5 @@
+%INCLUDE{IncludeFindAuth}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%

docs/wiki/foswiki/data/IncludeHeaderSubnet.txt

@@ -51,8 +51,3 @@ render: true }
 );
 });
 </script>
-
----++ Добавить
-
-%INCLUDE{IncludeAddPool}%
-

docs/wiki/foswiki/data/IncludeHeaderSwitch.txt

@@ -1,34 +1 @@
----++ Список оборудования по портам
-
-%SEARCH{
-"Parent='%BASETOPIC%' and ParentPort"
-topic="*"
-type="query"
-nosearch="on"
-nototal="on"
-header="|*Port*|*Name*|*Model*|*Description*|"
-format="| [[$topic][$formfield(ParentPort)]] | [[$topic][$formfield(Name)]]  | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
-order="formfield(ParentPort)"
-}%
-
-%INCLUDE{IncludeNetDevCommon}%
-
----++ Состояние портов
-
-<div id="container1"></div>
-
-<script type="text/javascript">
-$(function() {
-  $("#container1").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
-{ name: 'SWITCHINFO', 
-  host: '%FORMFIELD{"DeviceIP" topic="%BASETOPIC%"}%',
-  vendor: '%FORMFIELD{"Vendor" topic="%BASETOPIC%"}%',
-  community: '%FORMFIELD{"Community" topic="%BASETOPIC%"}%',
-  model: '%FORMFIELD{"DeviceModel" topic="%BASETOPIC%"}%',
-  topic: '%BASEWEB%.%BASETOPIC%',
-  web: '%BASEWEB%',
-  render: true }
-  );
-});
-</script>
-
+%INCLUDE{IncludeShowStat}%

docs/wiki/foswiki/data/IncludeHeaderUps.txt

@@ -1,4 +1,4 @@
-%INCLUDE{IncludeNetDevCommon}%
+%INCLUDE{IncludeShowStat}%
 
 ---++ Hardware
 
@@ -17,3 +17,4 @@ $(function() {
 });
 </script>
 
+%INCLUDE{IncludeNetDevCommon}%

docs/wiki/foswiki/data/IncludeHeaderVideoReg.txt

@@ -0,0 +1,7 @@
+%INCLUDE{IncludeShowStat}%
+
+%INCLUDE{IncludeFindCamList}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeHeaderVirtualHost.txt

@@ -0,0 +1 @@
+%INCLUDE{IncludeShowStat}%

docs/wiki/foswiki/data/IncludeHeaderVoipGate.txt

@@ -0,0 +1,7 @@
+%INCLUDE{IncludeShowStat}%
+
+%INCLUDE{IncludeFindPhoneList}%
+
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeListEquipmentHdd.txt

@@ -0,0 +1,26 @@
+---++ Список жёстких дисков в работе
+
+%SEARCH{
+"EquipmentType='HDD' and Disabled='' and Deleted=''"
+topic="Equipment*"
+type="query"
+nosearch="on"
+expandvariables="on"
+header="|*Server*|*Name*|*DevType*|*Interface*|*FormFactor*|*Model*|*Size*|*SN*|*Date Commissioning*|"
+format="| $formfield(Parent) | [[$topic][$formfield(Name)]] | $formfield(DeviceType) | $formfield(InterfaceType) | $formfield(FormFactor) | $formfield(DeviceModel) | $formfield(Size) | $formfield(SN) | $formfield(DateCommissioning) |"
+order="formfield(Parent)"
+}%
+
+
+---++ Список снятых дисков
+
+%SEARCH{
+"EquipmentType='HDD' and (Disabled!='' or Deleted!='')"
+topic="Equipment*"
+type="query"
+nosearch="on"
+expandvariables="on"
+header="|*Name*|*DevType*|*Interface*|*FormFactor*|*Model*|*Size*|*SN*|*Date Commissioning*|"
+format="| [[$topic][$formfield(Name)]] | $formfield(DeviceType) | $formfield(InterfaceType) | $formfield(FormFactor) | $formfield(DeviceModel) | $formfield(Size) | $formfield(SN) | $formfield(DateCommissioning) |"
+order="formfield(Parent)"
+}%

docs/wiki/foswiki/data/IncludeListStatGates.txt

@@ -0,0 +1,38 @@
+---++ Список адресов в stat
+
+<div id="container1"></div>
+
+<script type="text/javascript">
+$(function() {
+$("#container1").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{
+name: 'DATABASE_SQL',
+description: 'stat',
+sql: "SELECT User_auth.ip, User_auth.mac, User_auth.comments, User_auth.dns_name, User_auth.dhcp_hostname, User_auth.last_found FROM User_auth WHERE User_auth.user_id=1980 AND User_auth.deleted = 0 ORDER BY ip_int",
+header: "|*IP*|*MAC*|*DNS Name*|*DHCP hostname*| *Последняя активность* | *Комментарий*|",
+format: "| $ip | $mac | $dns_name | $dhcp_hostname | $last_found | $comments |",
+topic: '%BASEWEB%.%BASETOPIC%',
+web: '%BASEWEB%',
+render: true }
+);
+});
+</script>
+
+
+<div id="container2"></div>
+
+<script type="text/javascript">
+$(function() {
+$("#container2").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{
+name: 'DATABASE_SQL',
+description: 'stat',
+sql: "SELECT COUNT(*) as cnt FROM User_auth WHERE User_auth.user_id=1980 AND User_auth.deleted = 0",
+format: "Count: $cnt",
+topic: '%BASEWEB%.%BASETOPIC%',
+web: '%BASEWEB%',
+render: true }
+);
+});
+</script>
+

docs/wiki/foswiki/data/IncludeListStatIPCAM.txt

@@ -0,0 +1,36 @@
+---++ Список адресов в stat
+
+<div id="container1"></div>
+
+<script type="text/javascript">
+$(function() {
+$("#container1").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{
+name: 'DATABASE_SQL',
+description: 'stat',
+sql: "SELECT User_auth.ip, User_auth.mac, User_auth.comments, User_auth.dns_name, User_auth.dhcp_hostname, User_auth.last_found FROM User_auth WHERE (User_auth.user_id=354 or User_auth.user_id=1624) AND User_auth.deleted = 0 ORDER BY ip_int",
+header: "|*IP*|*MAC*|*DNS Name*|*DHCP hostname*| *Последняя активность* | *Комментарий*|",
+format: "| $ip | $mac | $dns_name | $dhcp_hostname | $last_found | $comments |",
+topic: '%BASEWEB%.%BASETOPIC%',
+web: '%BASEWEB%',
+render: true }
+);
+});
+</script>
+
+<div id="container2"></div>
+
+<script type="text/javascript">
+$(function() {
+$("#container2").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{
+name: 'DATABASE_SQL',
+description: 'stat',
+sql: "SELECT COUNT(*) as cnt FROM User_auth WHERE (User_auth.user_id=354 or User_auth.user_id=1624) AND User_auth.deleted = 0",
+format: "Count: $cnt",
+topic: '%BASEWEB%.%BASETOPIC%',
+web: '%BASEWEB%',
+render: true }
+);
+});
+</script>

docs/wiki/foswiki/data/IncludeListStatPhones.txt

@@ -0,0 +1,36 @@
+---++ Список адресов в stat
+
+<div id="container1"></div>
+
+<script type="text/javascript">
+$(function() {
+$("#container1").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{
+name: 'DATABASE_SQL',
+description: 'stat',
+sql: "SELECT User_auth.ip, User_auth.mac, User_auth.comments, User_auth.dns_name, User_auth.dhcp_hostname, User_auth.last_found FROM User_auth WHERE User_auth.user_id=355 AND User_auth.deleted = 0 ORDER BY ip_int",
+header: "|*IP*|*MAC*|*DNS Name*|*DHCP hostname*| *Последняя активность* | *Комментарий*|",
+format: "| $ip | $mac | $dns_name | $dhcp_hostname | $last_found | $comments |",
+topic: '%BASEWEB%.%BASETOPIC%',
+web: '%BASEWEB%',
+render: true }
+);
+});
+</script>
+
+<div id="container2"></div>
+
+<script type="text/javascript">
+$(function() {
+$("#container2").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{
+name: 'DATABASE_SQL',
+description: 'stat',
+sql: "SELECT COUNT(*) as cnt FROM User_auth WHERE User_auth.user_id=355 AND User_auth.deleted = 0",
+format: "Count: $cnt",
+topic: '%BASEWEB%.%BASETOPIC%',
+web: '%BASEWEB%',
+render: true }
+);
+});
+</script>

docs/wiki/foswiki/data/IncludeNetDevCommon.txt

@@ -1,5 +1,3 @@
-%INCLUDE{IncludeShowStat}%
-
 ---++ Аплинк
 |*Port*|*Parent device*|*Parent port*|
 | %FORMFIELD{"Uplink" topic="%BASETOPIC%"}% | %FORMFIELD{"Parent" topic="%BASETOPIC%"}% | %FORMFIELD{"ParentPort" topic="%BASETOPIC%"}% |

docs/wiki/foswiki/data/IncludeSelectEquipmentHdd.txt

@@ -0,0 +1 @@
+, %SEARCH{"Deleted='' and Disabled=''" scope="topic" topic="Equipment*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectHddType.txt

@@ -0,0 +1,9 @@
+HDD,
+SAS,
+SSD,
+SSHD,
+SCSI,
+FDD,
+CDROM,
+USBSSD,
+USBFLASH

docs/wiki/foswiki/data/IncludeSelectVendor.txt

@@ -1 +1 @@
-%DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }%
+, %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }%

docs/wiki/foswiki/data/IncludeSnmpPort.txt

@@ -0,0 +1,31 @@
+---++ Список оборудования по портам
+
+%SEARCH{
+"Parent='%BASETOPIC%' and ParentPort"
+topic="*"
+type="query"
+nosearch="on"
+nototal="on"
+header="|*Port*|*Name*|*Model*|*Description*|"
+format="| [[$topic][$formfield(ParentPort)]] | $formfield(Name)  | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+order="formfield(ParentPort)"
+}%
+
+---++ Состояние портов
+
+<div id="container1"></div>
+
+<script type="text/javascript">
+$(function() {
+  $("#container1").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
+{ name: 'SWITCHINFO', 
+  host: '%FORMFIELD{"DeviceIP" topic="%BASETOPIC%"}%',
+  vendor: '%FORMFIELD{"Vendor" topic="%BASETOPIC%"}%',
+  community: '%FORMFIELD{"Community" topic="%BASETOPIC%"}%',
+  model: '%FORMFIELD{"DeviceModel" topic="%BASETOPIC%"}%',
+  topic: '%BASEWEB%.%BASETOPIC%',
+  web: '%BASEWEB%',
+  render: true }
+  );
+});
+</script>

docs/wiki/foswiki/data/ListOfAts.txt

@@ -2,9 +2,9 @@
 %META:TOPICPARENT{name="NetworkSovtest"}%
 ---+!! АТС
 
-%INCLUDE{IncludeShowAtss}%
+%INCLUDE{IncludeFindAtss}%
 
-%INCLUDE{IncludeShowAtssDisabled}%
+%INCLUDE{IncludeFindAtssDisabled}%
 
 ---++ Работа
 

docs/wiki/foswiki/data/ListOfCeph.txt

@@ -15,6 +15,87 @@ format="| [[$topic][$formfield(Servicetype)]] | $formfield(Description) | $formf
 
 ---++ Список OSD
 
+   * [[ServerDrop00Cloud][host drop-00]] (6 SSD) 
+<verbatim>
+  8    ssd   0.87329              osd.8         up   1.00000  1.00000
+ 10    ssd   0.87329              osd.10        up   1.00000  1.00000
+ 22    ssd   0.87329              osd.22        up   1.00000  1.00000
+ 23    ssd   0.87329              osd.23        up   1.00000  1.00000
+ 25    ssd   0.87299              osd.25        up   1.00000  1.00000
+ 27    ssd   0.87329              osd.27        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop02Cloud][host drop-02]] (2 HDD, 4 SSD)
+<verbatim>
+ 47    hdd   0.81839              osd.47        up   1.00000  1.00000
+ 49    hdd   0.81839              osd.49        up   0.75006  1.00000
+  0    ssd   0.87329              osd.0         up   1.00000  1.00000
+  2    ssd   0.87329              osd.2         up   1.00000  1.00000
+ 12    ssd   0.87329              osd.12        up   1.00000  1.00000
+ 24    ssd   0.87329              osd.24        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop03Cloud][host drop-03]] (4 HDD)
+<verbatim>
+  6    hdd   3.63869              osd.6         up   1.00000  1.00000
+  7    hdd   3.63869              osd.7         up   1.00000  1.00000
+ 28    hdd   3.63869              osd.28        up   0.90002  1.00000
+ 44    hdd   3.63869              osd.44        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop05Cloud][host drop-05]] (4 SSD)
+<verbatim>
+  3    ssd   0.87329              osd.3         up   0.90733  1.00000
+ 15    ssd   0.43660              osd.15        up   1.00000  1.00000
+ 17    ssd   0.43660              osd.17        up   1.00000  1.00000
+ 18    ssd   0.43700              osd.18        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop06Cloud][host drop-06]] (1 HDD, 3 SSD)
+<verbatim>
+ 41    hdd   3.63869              osd.41        up   0.95001  1.00000
+ 13    ssd   0.43700              osd.13        up   1.00000  1.00000
+ 16    ssd   0.43700              osd.16        up   1.00000  1.00000
+ 19    ssd   0.43700              osd.19        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop07Cloud][host drop-07]] (7 HDD)
+<verbatim>
+ 14    hdd   3.63869              osd.14        up   1.00000  1.00000
+ 26    hdd   3.63869              osd.26        up   1.00000  1.00000
+ 31    hdd   3.63869              osd.31        up   1.00000  1.00000
+ 37    hdd   3.63869              osd.37        up   1.00000  1.00000
+ 38    hdd   1.81929              osd.38        up   0.97945  1.00000
+ 39    hdd   1.81929              osd.39        up   1.00000  1.00000
+ 40    hdd   1.81929              osd.40        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop11Cloud][host drop-11]] (7 HDD)
+<verbatim>
+  4    hdd   3.63869              osd.4         up   1.00000  1.00000
+ 11    hdd   3.63869              osd.11        up   1.00000  1.00000
+ 29    hdd   3.63869              osd.29        up   1.00000  1.00000
+ 30    hdd   3.63869              osd.30        up   1.00000  1.00000
+ 32    hdd   3.63869              osd.32        up   1.00000  1.00000
+ 33    hdd   3.63869              osd.33        up   1.00000  1.00000
+ 36    hdd   0.90919              osd.36        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop12Cloud][host drop-12]] (5 SSD)
+<verbatim>
+  5    ssd   0.87279              osd.5         up   1.00000  1.00000
+ 35    ssd   0.87279              osd.35        up   1.00000  1.00000
+ 42    ssd   0.87279              osd.42        up   1.00000  1.00000
+ 45    ssd   0.87209              osd.45        up   1.00000  1.00000
+ 46    ssd   0.87209              osd.46        up   1.00000  1.00000
+</verbatim>
+   * [[ServerDrop13Cloud][host drop-13]] (7 HDD, 3 SSD)
+<verbatim>
+ 21    hdd   0.81760              osd.21        up   0.70007  1.00000
+ 34    hdd   0.81760              osd.34        up   0.85619  1.00000
+ 50    hdd   0.81760              osd.50        up   0.80005  1.00000
+ 51    hdd   0.81760              osd.51        up   0.75006  1.00000
+ 52    hdd   0.81760              osd.52        up   1.00000  1.00000
+ 53    hdd   0.81760              osd.53        up   1.00000  1.00000
+ 54    hdd   0.81760              osd.54        up   0.80005  1.00000
+  1    ssd   0.87219              osd.1         up   1.00000  1.00000
+  9    ssd   0.87219              osd.9         up   1.00000  1.00000
+ 20    ssd   0.43559              osd.20        up   1.00000  1.00000
+</verbatim>
+
 ---++ Работа
 
 %COMMENT{type="workflow"}%

docs/wiki/foswiki/data/ListOfEquipment.txt

@@ -0,0 +1,20 @@
+%META:TOPICINFO{author="roman" comment="reprev" date="1626416532" format="1.1" reprev="3" version="4"}%
+
+---++ Оборудование
+
+   * [[ListGatewaysSovtestLocal][Шлюзы и роутеры]]
+   * [[ListSwitchesSovtestLocal][Свичи]]
+   * [[ListOfWlac][Wireless Controllers]]
+   * [[ListOfHardware][Сервера]]
+   * [[ListOfEquipmentHdd][HDD|SSD]]
+   * [[ListOfPrinters][Принтеры]]
+
+---++ Работа
+
+%COMMENT{type="workflow"}%
+
+-- Main.RomanDmitriev - 2020/10/11
+
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/ListOfEquipmentHdd.txt

@@ -0,0 +1,18 @@
+%META:TOPICINFO{author="roman" comment="reprev" date="1626416532" format="1.1" reprev="3" version="4"}%
+
+%INCLUDE{IncludeListEquipmentHdd}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddEquipmentHdd}%
+
+---++ Работа
+
+%COMMENT{type="workflow"}%
+
+-- Main.RomanDmitriev - 2020/10/11
+
+%META:TOPICMOVED{by="roman" date="1624971526" from="Sovtest.ListServersInternet" to="Sovtest.ListOfServersInternet"}%
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%