upload mysql database structure

docs/mysql/stat_extra.sql

@@ -1,29 +1,35 @@
 
 --
--- Индексы сохранённых таблиц
+-- Indexes for dumped tables
 --
 
 --
--- Индексы таблицы `building`
+-- Indexes for table `auth_rules`
+--
+ALTER TABLE `auth_rules`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Indexes for table `building`
 --
 ALTER TABLE `building`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `config`
+-- Indexes for table `config`
 --
 ALTER TABLE `config`
   ADD PRIMARY KEY (`id`),
   ADD KEY `option` (`option_id`);
 
 --
--- Индексы таблицы `config_options`
+-- Indexes for table `config_options`
 --
 ALTER TABLE `config_options`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `connections`
+-- Indexes for table `connections`
 --
 ALTER TABLE `connections`
   ADD PRIMARY KEY (`id`),
@@ -31,50 +37,59 @@ ALTER TABLE `connections`
   ADD KEY `device_id` (`device_id`,`port_id`);
 
 --
--- Индексы таблицы `Customers`
+-- Indexes for table `Customers`
 --
 ALTER TABLE `Customers`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `devices`
+-- Indexes for table `devices`
 --
 ALTER TABLE `devices`
   ADD PRIMARY KEY (`id`),
-  ADD KEY `device_model_id` (`device_model`),
+  ADD UNIQUE KEY `id` (`id`),
   ADD KEY `ip` (`ip`),
   ADD KEY `device_type` (`device_type`);
 
 --
--- Индексы таблицы `device_l3_interfaces`
+-- Indexes for table `device_l3_interfaces`
 --
 ALTER TABLE `device_l3_interfaces`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `device_ports`
+-- Indexes for table `device_models`
+--
+ALTER TABLE `device_models`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Indexes for table `device_ports`
 --
 ALTER TABLE `device_ports`
   ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `id` (`id`),
   ADD KEY `device_id` (`device_id`),
   ADD KEY `port` (`port`),
   ADD KEY `target_port_id` (`target_port_id`);
 
 --
--- Индексы таблицы `device_types`
+-- Indexes for table `device_types`
 --
 ALTER TABLE `device_types`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `dhcp_log`
+-- Indexes for table `dhcp_log`
 --
 ALTER TABLE `dhcp_log`
   ADD PRIMARY KEY (`id`),
-  ADD KEY `timestamp` (`timestamp`,`action`);
+  ADD KEY `timestamp` (`timestamp`),
+  ADD KEY `ip1` (`ip`),
+  ADD KEY `timestamp_2` (`timestamp`,`action`);
 
 --
--- Индексы таблицы `dns_cache`
+-- Indexes for table `dns_cache`
 --
 ALTER TABLE `dns_cache`
   ADD PRIMARY KEY (`id`),
@@ -82,65 +97,68 @@ ALTER TABLE `dns_cache`
   ADD KEY `timestamp` (`timestamp`);
 
 --
--- Индексы таблицы `Filter_list`
+-- Indexes for table `Filter_list`
 --
 ALTER TABLE `Filter_list`
   ADD PRIMARY KEY (`id`),
   ADD KEY `Name` (`name`);
 
 --
--- Индексы таблицы `Group_filters`
+-- Indexes for table `Group_filters`
 --
 ALTER TABLE `Group_filters`
   ADD PRIMARY KEY (`id`),
   ADD KEY `GroupId` (`group_id`,`filter_id`);
 
 --
--- Индексы таблицы `Group_list`
+-- Indexes for table `Group_list`
 --
 ALTER TABLE `Group_list`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `mac_history`
+-- Indexes for table `mac_history`
 --
 ALTER TABLE `mac_history`
   ADD PRIMARY KEY (`id`),
-  ADD KEY `mac` (`mac`,`timestamp`),
-  ADD KEY `ip` (`ip`,`timestamp`),
+  ADD KEY `mac` (`mac`,`timestamp`) USING BTREE,
+  ADD KEY `ip` (`ip`,`timestamp`) USING BTREE,
   ADD KEY `timestamp` (`timestamp`,`mac`),
   ADD KEY `timestamp_2` (`timestamp`,`ip`);
 
 --
--- Индексы таблицы `mac_vendors`
+-- Indexes for table `mac_vendors`
 --
 ALTER TABLE `mac_vendors`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `oui` (`oui`);
 
 --
--- Индексы таблицы `OU`
+-- Indexes for table `OU`
 --
 ALTER TABLE `OU`
   ADD PRIMARY KEY (`id`);
 
 --
--- Индексы таблицы `Queue_list`
+-- Indexes for table `Queue_list`
 --
 ALTER TABLE `Queue_list`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `id` (`id`);
 
 --
--- Индексы таблицы `remote_syslog`
+-- Indexes for table `remote_syslog`
 --
 ALTER TABLE `remote_syslog`
   ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `id` (`id`),
+  ADD KEY `device_id` (`device_id`),
   ADD KEY `date` (`date`,`device_id`,`ip`);
 ALTER TABLE `remote_syslog` ADD FULLTEXT KEY `message` (`message`);
+ALTER TABLE `remote_syslog` ADD FULLTEXT KEY `message_2` (`message`);
 
 --
--- Индексы таблицы `subnets`
+-- Indexes for table `subnets`
 --
 ALTER TABLE `subnets`
   ADD PRIMARY KEY (`id`),
@@ -148,14 +166,19 @@ ALTER TABLE `subnets`
   ADD KEY `dhcp` (`dhcp`,`office`,`hotspot`,`static`);
 
 --
--- Индексы таблицы `syslog`
+-- Indexes for table `syslog`
 --
 ALTER TABLE `syslog`
   ADD PRIMARY KEY (`id`),
+  ADD KEY `auth_idx` (`auth_id`),
+  ADD KEY `timestamp` (`timestamp`,`auth_id`,`customer`,`level`),
   ADD KEY `timestamp_2` (`timestamp`,`level`,`customer`);
+ALTER TABLE `syslog` ADD FULLTEXT KEY `message` (`message`);
+ALTER TABLE `syslog` ADD FULLTEXT KEY `message_2` (`message`);
+ALTER TABLE `syslog` ADD FULLTEXT KEY `customer` (`customer`);
 
 --
--- Индексы таблицы `Traffic_detail`
+-- Indexes for table `Traffic_detail`
 --
 ALTER TABLE `Traffic_detail`
   ADD PRIMARY KEY (`id`),
@@ -163,50 +186,51 @@ ALTER TABLE `Traffic_detail`
   ADD KEY `dst` (`auth_id`,`timestamp`,`router_id`,`dst_ip`);
 
 --
--- Индексы таблицы `Unknown_mac`
+-- Indexes for table `Unknown_mac`
 --
 ALTER TABLE `Unknown_mac`
   ADD PRIMARY KEY (`id`),
+  ADD KEY `mac` (`mac`,`timestamp`),
   ADD KEY `timestamp` (`timestamp`,`device_id`,`port_id`,`mac`);
 
 --
--- Индексы таблицы `User_auth`
+-- Indexes for table `User_auth`
 --
 ALTER TABLE `User_auth`
   ADD PRIMARY KEY (`id`),
-  ADD KEY `auth_index` (`id`,`user_id`,`ip_int`,`mac`,`ip`,`deleted`) USING BTREE,
+  ADD KEY `auth_index` (`id`,`user_id`,`ip_int`,`mac`,`ip`,`deleted`),
   ADD KEY `deleted` (`deleted`);
 
 --
--- Индексы таблицы `User_auth_alias`
+-- Indexes for table `User_auth_alias`
 --
 ALTER TABLE `User_auth_alias`
   ADD PRIMARY KEY (`id`),
   ADD KEY `auth_id` (`auth_id`);
 
 --
--- Индексы таблицы `User_list`
+-- Indexes for table `User_list`
 --
 ALTER TABLE `User_list`
   ADD PRIMARY KEY (`id`),
   ADD KEY `users` (`id`,`ou_id`,`enabled`,`blocked`,`deleted`);
 
 --
--- Индексы таблицы `User_stats`
+-- Indexes for table `User_stats`
 --
 ALTER TABLE `User_stats`
   ADD PRIMARY KEY (`id`),
   ADD KEY `timestamp` (`timestamp`,`auth_id`,`router_id`);
 
 --
--- Индексы таблицы `User_stats_full`
+-- Indexes for table `User_stats_full`
 --
 ALTER TABLE `User_stats_full`
   ADD PRIMARY KEY (`id`),
   ADD KEY `timestamp` (`timestamp`,`auth_id`,`router_id`);
 
 --
--- Индексы таблицы `variables`
+-- Indexes for table `variables`
 --
 ALTER TABLE `variables`
   ADD PRIMARY KEY (`id`),
@@ -214,185 +238,203 @@ ALTER TABLE `variables`
   ADD KEY `clear_time` (`clear_time`,`created`);
 
 --
--- AUTO_INCREMENT для сохранённых таблиц
+-- Indexes for table `vendors`
 --
+ALTER TABLE `vendors`
+  ADD PRIMARY KEY (`id`);
 
 --
--- AUTO_INCREMENT для таблицы `building`
+-- AUTO_INCREMENT for dumped tables
 --
-ALTER TABLE `building`
+
+--
+-- AUTO_INCREMENT for table `auth_rules`
+--
+ALTER TABLE `auth_rules`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `config`
+-- AUTO_INCREMENT for table `building`
+--
+ALTER TABLE `building`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
+
+--
+-- AUTO_INCREMENT for table `config`
 --
 ALTER TABLE `config`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=111;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `config_options`
+-- AUTO_INCREMENT for table `config_options`
 --
 ALTER TABLE `config_options`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=57;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=63;
 
 --
--- AUTO_INCREMENT для таблицы `connections`
+-- AUTO_INCREMENT for table `connections`
 --
 ALTER TABLE `connections`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `Customers`
+-- AUTO_INCREMENT for table `Customers`
 --
 ALTER TABLE `Customers`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `devices`
+-- AUTO_INCREMENT for table `devices`
 --
 ALTER TABLE `devices`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `device_l3_interfaces`
+-- AUTO_INCREMENT for table `device_l3_interfaces`
 --
 ALTER TABLE `device_l3_interfaces`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `device_ports`
+-- AUTO_INCREMENT for table `device_models`
+--
+ALTER TABLE `device_models`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10000;
+
+--
+-- AUTO_INCREMENT for table `device_ports`
 --
 ALTER TABLE `device_ports`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `device_types`
+-- AUTO_INCREMENT for table `device_types`
 --
 ALTER TABLE `device_types`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
 
 --
--- AUTO_INCREMENT для таблицы `dhcp_log`
+-- AUTO_INCREMENT for table `dhcp_log`
 --
 ALTER TABLE `dhcp_log`
   MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `dns_cache`
+-- AUTO_INCREMENT for table `dns_cache`
 --
 ALTER TABLE `dns_cache`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `Filter_list`
+-- AUTO_INCREMENT for table `Filter_list`
 --
 ALTER TABLE `Filter_list`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=107;
 
 --
--- AUTO_INCREMENT для таблицы `Group_filters`
+-- AUTO_INCREMENT for table `Group_filters`
 --
 ALTER TABLE `Group_filters`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=235;
 
 --
--- AUTO_INCREMENT для таблицы `Group_list`
+-- AUTO_INCREMENT for table `Group_list`
 --
 ALTER TABLE `Group_list`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `mac_history`
+-- AUTO_INCREMENT for table `mac_history`
 --
 ALTER TABLE `mac_history`
   MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `mac_vendors`
+-- AUTO_INCREMENT for table `mac_vendors`
 --
 ALTER TABLE `mac_vendors`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=38949;
 
 --
--- AUTO_INCREMENT для таблицы `OU`
+-- AUTO_INCREMENT for table `OU`
 --
 ALTER TABLE `OU`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `Queue_list`
+-- AUTO_INCREMENT for table `Queue_list`
 --
 ALTER TABLE `Queue_list`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
 
 --
--- AUTO_INCREMENT для таблицы `remote_syslog`
+-- AUTO_INCREMENT for table `remote_syslog`
 --
 ALTER TABLE `remote_syslog`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `subnets`
+-- AUTO_INCREMENT for table `subnets`
 --
 ALTER TABLE `subnets`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `syslog`
+-- AUTO_INCREMENT for table `syslog`
 --
 ALTER TABLE `syslog`
   MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `Traffic_detail`
+-- AUTO_INCREMENT for table `Traffic_detail`
 --
 ALTER TABLE `Traffic_detail`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `Unknown_mac`
+-- AUTO_INCREMENT for table `Unknown_mac`
 --
 ALTER TABLE `Unknown_mac`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `User_auth`
+-- AUTO_INCREMENT for table `User_auth`
 --
 ALTER TABLE `User_auth`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `User_auth_alias`
+-- AUTO_INCREMENT for table `User_auth_alias`
 --
 ALTER TABLE `User_auth_alias`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `User_list`
+-- AUTO_INCREMENT for table `User_list`
 --
 ALTER TABLE `User_list`
   MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `User_stats`
+-- AUTO_INCREMENT for table `User_stats`
 --
 ALTER TABLE `User_stats`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `User_stats_full`
+-- AUTO_INCREMENT for table `User_stats_full`
 --
 ALTER TABLE `User_stats_full`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `variables`
+-- AUTO_INCREMENT for table `variables`
 --
 ALTER TABLE `variables`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
 --
--- AUTO_INCREMENT для таблицы `vendors`
+-- AUTO_INCREMENT for table `vendors`
 --
 ALTER TABLE `vendors`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=20;
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10000;

docs/mysql/stat_table_OU.sql

@@ -2,34 +2,32 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `OU`
+-- Table structure for table `OU`
 --
 
 CREATE TABLE `OU` (
   `id` int(11) NOT NULL,
-  `ou_name` varchar(40) DEFAULT NULL,
-  `nagios_dir` varchar(255) DEFAULT NULL
+  `ou_name` varchar(40) NOT NULL DEFAULT '',
+  `nagios_dir` varchar(255) DEFAULT NULL,
+  `nagios_host_use` varchar(50) DEFAULT NULL,
+  `nagios_ping` tinyint(1) NOT NULL DEFAULT 1,
+  `nagios_default_service` varchar(100) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Дамп данных таблицы `OU`
+-- Dumping data for table `OU`
 --
 
-INSERT INTO `OU` (`id`, `ou_name`, `nagios_dir`) VALUES
-(0, '!Всё', '/etc/nagios/any'),
-(1, 'Сервера', NULL),
-(2, 'Администраторы', NULL),
-(3, 'Пользователи', NULL),
-(4, 'VOIP', '/etc/nagios/voip'),
-(5, 'IPCAM', '/etc/nagios/videocam'),
-(6, 'Принтеры', '/etc/nagios/printers'),
-(7, 'Свичи', '/etc/nagios/switches'),
-(8, 'UPS', '/etc/nagios/ups'),
-(9, 'Охрана', '/etc/nagios/security'),
-(10, 'Роутеры', '/etc/nagios/routers'),
-(11, 'IPTV', NULL),
-(12, 'WiFi AP', '/etc/nagios/ap'),
-(13, 'Техподдержка', NULL),
-(14, 'POS-терминалы', NULL),
-(15, 'WiFi', NULL),
-(16, 'VPN', NULL);
+INSERT INTO `OU` (`id`, `ou_name`, `nagios_dir`, `nagios_host_use`, `nagios_ping`, `nagios_default_service`) VALUES
+(0, '!Всё', 'any', 'generic-host', 1, NULL),
+(1, 'Сервера', NULL, NULL, 1, NULL),
+(2, 'Администраторы', NULL, NULL, 1, NULL),
+(4, 'VOIP', 'voip', 'voip', 1, NULL),
+(5, 'IPCAM', 'videocam', 'ip-cam', 0, NULL),
+(6, 'Принтеры', 'printers', 'printers', 1, 'printer-service'),
+(8, 'UPS', 'ups', 'ups', 1, NULL),
+(9, 'Охрана', 'security', 'security', 1, NULL),
+(10, 'Роутеры', 'routers', 'routers', 1, NULL),
+(12, 'WiFi AP', 'ap', 'ap', 1, NULL),
+(16, 'Пользователи', NULL, NULL, 1, NULL),
+(17, 'Свичи', NULL, NULL, 1, NULL);

docs/mysql/stat_table_User_auth.sql

@@ -1,62 +1,41 @@
 
+-- --------------------------------------------------------
+
 --
--- Структура таблицы `User_auth`
+-- Table structure for table `User_auth`
 --
 
 CREATE TABLE `User_auth` (
   `id` int(11) NOT NULL,
   `user_id` int(11) NOT NULL DEFAULT 0,
   `ip` varchar(18) NOT NULL DEFAULT '',
-  `ip_int` int(10) UNSIGNED NOT NULL DEFAULT 0,
-  `save_traf` tinyint(1) NOT NULL DEFAULT 0,
+  `ip_int` int(10) UNSIGNED NOT NULL,
   `enabled` tinyint(1) NOT NULL DEFAULT 0,
   `dhcp` tinyint(1) NOT NULL DEFAULT 1,
-  `timestamp` timestamp NOT NULL DEFAULT current_timestamp(),
-  `clientid` varchar(50) NOT NULL DEFAULT '',
-  `nagios` tinyint(1) NOT NULL DEFAULT 0,
-  `nagios_status` varchar(10) NOT NULL DEFAULT 'UP',
   `filter_group_id` tinyint(1) NOT NULL DEFAULT 0,
   `deleted` tinyint(4) NOT NULL DEFAULT 0,
   `comments` text DEFAULT NULL,
-  `dns_name` varchar(60) NOT NULL DEFAULT '',
+  `dns_name` varchar(60) DEFAULT NULL,
   `WikiName` varchar(250) DEFAULT NULL,
   `dhcp_acl` text DEFAULT NULL,
-  `queue_id` int(11) NOT NULL DEFAULT 0,
-  `mac` varchar(20) NOT NULL DEFAULT '',
-  `dhcp_action` varchar(10) DEFAULT '',
-  `dhcp_time` datetime NOT NULL DEFAULT current_timestamp(),
+  `queue_id` int(11) NOT NULL DEFAULT 1,
+  `mac` varchar(20) DEFAULT NULL,
+  `dhcp_action` varchar(10) DEFAULT NULL,
+  `dhcp_time` datetime DEFAULT NULL,
   `dhcp_hostname` varchar(60) DEFAULT NULL,
-  `last_found` datetime DEFAULT current_timestamp(),
+  `last_found` datetime DEFAULT NULL,
   `blocked` tinyint(1) NOT NULL DEFAULT 0,
   `day_quota` int(11) NOT NULL DEFAULT 0,
   `month_quota` int(11) NOT NULL DEFAULT 0,
   `device_model_id` int(11) DEFAULT 87,
-  `host_model` varchar(50) DEFAULT '',
-  `nagios_handler` varchar(50) DEFAULT '',
+  `firmware` varchar(100) DEFAULT NULL,
+  `timestamp` timestamp NOT NULL DEFAULT current_timestamp(),
+  `clientid` varchar(50) DEFAULT NULL,
+  `nagios` tinyint(1) NOT NULL DEFAULT 0,
+  `nagios_status` varchar(10) DEFAULT NULL,
+  `nagios_handler` varchar(50) DEFAULT NULL,
   `link_check` tinyint(1) NOT NULL DEFAULT 0,
   `changed` tinyint(1) NOT NULL DEFAULT 0,
-  `changed_time` datetime NOT NULL DEFAULT current_timestamp()
+  `changed_time` datetime NOT NULL DEFAULT current_timestamp(),
+  `save_traf` tinyint(1) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-
---
--- Индексы сохранённых таблиц
---
-
---
--- Индексы таблицы `User_auth`
---
-ALTER TABLE `User_auth`
-  ADD PRIMARY KEY (`id`),
-  ADD KEY `auth_index` (`id`,`user_id`,`ip_int`,`mac`,`ip`,`deleted`) USING BTREE,
-  ADD KEY `deleted` (`deleted`);
-
---
--- AUTO_INCREMENT для сохранённых таблиц
---
-
---
--- AUTO_INCREMENT для таблицы `User_auth`
---
-ALTER TABLE `User_auth`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;

docs/mysql/stat_table_User_auth_alias.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `User_auth_alias`
+-- Table structure for table `User_auth_alias`
 --
 
 CREATE TABLE `User_auth_alias` (

docs/mysql/stat_table_User_list.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `User_list`
+-- Table structure for table `User_list`
 --
 
 CREATE TABLE `User_list` (
@@ -17,12 +17,12 @@ CREATE TABLE `User_list` (
   `filter_group_id` int(11) NOT NULL DEFAULT 0,
   `queue_id` int(11) NOT NULL DEFAULT 0,
   `day_quota` int(11) NOT NULL DEFAULT 0,
-  `month_quota` int(11) NOT NULL DEFAULT 0,
+  `month_quota` int(11) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Дамп данных таблицы `User_list`
+-- Dumping data for table `User_list`
 --
 
-INSERT INTO `User_list` (`id`, `login`, `fio`, `enabled`, `blocked`, `deleted`, `ou_id`, `filter_group_id`, `queue_id`, `day_quota`, `month_quota`) VALUES
-(1, 'default', '', 0, 0, 0, 3, 2, 0, 0, 0);
+INSERT INTO `User_list` (`id`, `timestamp`, `login`, `fio`, `enabled`, `blocked`, `deleted`, `ou_id`, `filter_group_id`, `queue_id`, `day_quota`, `month_quota`) VALUES
+(1, '2017-11-02 10:54:36', 'default', '', 0, 0, 0, 32, 0, 0, 0, 0);

docs/mysql/stat_table_User_stats.sql

@@ -2,14 +2,14 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `User_stats`
+-- Table structure for table `User_stats`
 --
 
 CREATE TABLE `User_stats` (
   `id` int(11) NOT NULL,
   `router_id` int(11) DEFAULT 0,
   `auth_id` int(11) NOT NULL DEFAULT 0,
-  `timestamp` datetime NOT NULL DEFAULT current_timestamp(),
+  `timestamp` datetime NOT NULL,
   `byte_in` bigint(20) NOT NULL DEFAULT 0,
   `byte_out` bigint(20) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

docs/mysql/stat_table_User_stats_full.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `User_stats_full`
+-- Table structure for table `User_stats_full`
 --
 
 CREATE TABLE `User_stats_full` (

docs/mysql/stat_table_auth_rules.sql

@@ -1,2 +1,13 @@
-CREATE TABLE `auth_rules` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `type` INT NOT NULL , `rule` VARCHAR(40) NULL DEFAULT NULL , PRIMARY KEY (`id`), INDEX (`user_id`)) ENGINE = InnoDB;
-ALTER TABLE `auth_rules` ADD UNIQUE(`rule`);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `auth_rules`
+--
+
+CREATE TABLE `auth_rules` (
+  `id` int(11) NOT NULL,
+  `user_id` int(11) NOT NULL,
+  `type` int(11) NOT NULL,
+  `rule` varchar(40) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

docs/mysql/stat_table_building.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `building`
+-- Table structure for table `building`
 --
 
 CREATE TABLE `building` (
@@ -12,7 +12,12 @@ CREATE TABLE `building` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Дамп данных таблицы `building`
+-- Truncate table before insert `building`
+--
+
+TRUNCATE TABLE `building`;
+--
+-- Dumping data for table `building`
 --
 
 INSERT INTO `building` (`id`, `name`, `comment`) VALUES

docs/mysql/stat_table_config.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `config`
+-- Table structure for table `config`
 --
 
 CREATE TABLE `config` (
@@ -10,12 +10,3 @@ CREATE TABLE `config` (
   `option_id` int(11) DEFAULT NULL,
   `value` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Дамп данных таблицы `config`
---
-
-INSERT INTO `config` (`id`, `option_id`, `value`) VALUES
-(1, 1, '1024'),
-(2, 22, '1'),
-(3, 17, '1');

docs/mysql/stat_table_config_options.sql

@@ -2,22 +2,27 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `config_options`
+-- Table structure for table `config_options`
 --
 
 CREATE TABLE `config_options` (
   `id` int(11) NOT NULL,
-  `option_name` varchar(50) NOT NULL,
+  `option_name` varchar(50) DEFAULT NULL,
   `description` text DEFAULT NULL,
   `uniq` tinyint(1) NOT NULL DEFAULT 1,
-  `type` varchar(10) NOT NULL,
+  `type` varchar(10) DEFAULT NULL,
   `default_value` text DEFAULT NULL,
   `min_value` int(11) NOT NULL DEFAULT 0,
   `max_value` int(11) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Дамп данных таблицы `config_options`
+-- Truncate table before insert `config_options`
+--
+
+TRUNCATE TABLE `config_options`;
+--
+-- Dumping data for table `config_options`
 --
 
 INSERT INTO `config_options` (`id`, `option_name`, `description`, `uniq`, `type`, `default_value`, `min_value`, `max_value`) VALUES

docs/mysql/stat_table_connections.sql

@@ -2,12 +2,12 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `connections`
+-- Table structure for table `connections`
 --
 
 CREATE TABLE `connections` (
   `id` int(11) NOT NULL,
-  `device_id` int(11) NOT NULL,
-  `port_id` int(11) NOT NULL,
-  `auth_id` int(11) NOT NULL
+  `device_id` int(11) DEFAULT NULL,
+  `port_id` int(11) DEFAULT NULL,
+  `auth_id` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

docs/mysql/stat_table_device_l3_interfaces.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `device_l3_interfaces`
+-- Table structure for table `device_l3_interfaces`
 --
 
 CREATE TABLE `device_l3_interfaces` (

docs/mysql/stat_table_device_models.sql

@@ -1,6 +1,8 @@
 
+-- --------------------------------------------------------
+
 --
--- Структура таблицы `device_models`
+-- Table structure for table `device_models`
 --
 
 CREATE TABLE `device_models` (
@@ -10,8 +12,6 @@ CREATE TABLE `device_models` (
   `nagios_template` varchar(200) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-
-TRUNCATE TABLE `device_models`;
 --
 -- Dumping data for table `device_models`
 --
@@ -128,20 +128,3 @@ INSERT INTO `device_models` (`id`, `model_name`, `vendor_id`, `nagios_template`)
 (111, 'MES2428B', 2, NULL),
 (112, 'CRS109-8G-1S-2HnD', 9, NULL),
 (113, 'MES2324', 2, NULL);
-
-
---
--- Индексы таблицы `device_models`
---
-ALTER TABLE `device_models`
-  ADD PRIMARY KEY (`id`);
-
---
--- AUTO_INCREMENT для сохранённых таблиц
---
-
---
--- AUTO_INCREMENT для таблицы `device_models`
---
-ALTER TABLE `device_models`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10000;

docs/mysql/stat_table_device_ports.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `device_ports`
+-- Table structure for table `device_ports`
 --
 
 CREATE TABLE `device_ports` (
@@ -11,9 +11,9 @@ CREATE TABLE `device_ports` (
   `snmp_index` int(11) DEFAULT NULL,
   `port` int(11) DEFAULT NULL,
   `comment` varchar(50) DEFAULT NULL,
-  `target_port_id` int(11) NOT NULL DEFAULT 0,
+  `target_port_id` int(11) DEFAULT NULL,
   `auth_id` int(11) DEFAULT NULL,
-  `last_mac_count` int(11) DEFAULT 0,
+  `last_mac_count` int(11) DEFAULT NULL,
   `uplink` tinyint(1) NOT NULL DEFAULT 0,
   `nagios` tinyint(1) NOT NULL DEFAULT 0,
   `skip` tinyint(1) NOT NULL DEFAULT 0,

docs/mysql/stat_table_device_types.sql

@@ -2,10 +2,25 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `device_types`
+-- Table structure for table `device_types`
 --
 
 CREATE TABLE `device_types` (
   `id` int(11) NOT NULL,
   `name` varchar(50) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Truncate table before insert `device_types`
+--
+
+TRUNCATE TABLE `device_types`;
+--
+-- Dumping data for table `device_types`
+--
+
+INSERT INTO `device_types` (`id`, `name`) VALUES
+(1, 'Свич'),
+(2, 'Роутер'),
+(3, 'Сервер'),
+(4, 'Точка доступа');

docs/mysql/stat_table_devices.sql

@@ -1,19 +1,21 @@
+
+-- --------------------------------------------------------
+
 --
--- Структура таблицы `devices`
+-- Table structure for table `devices`
 --
 
 CREATE TABLE `devices` (
   `id` int(11) NOT NULL,
-  `device_model` varchar(50) DEFAULT '',
   `device_type` int(11) NOT NULL DEFAULT 1,
   `device_model_id` int(11) DEFAULT 89,
+  `firmware` varchar(100) DEFAULT NULL,
   `vendor_id` int(11) NOT NULL DEFAULT 1,
-  `device_name` varchar(50) DEFAULT '',
+  `device_name` varchar(50) DEFAULT NULL,
   `building_id` int(11) NOT NULL DEFAULT 1,
-  `ip` varchar(15) DEFAULT '',
+  `ip` varchar(15) DEFAULT NULL,
   `port_count` int(11) NOT NULL DEFAULT 0,
   `SN` varchar(80) DEFAULT NULL,
-  `dhcp` tinyint(1) NOT NULL DEFAULT 0,
   `comment` text DEFAULT NULL,
   `snmp_version` tinyint(4) NOT NULL DEFAULT 0,
   `snmp3_user_rw` varchar(20) DEFAULT NULL,
@@ -25,35 +27,12 @@ CREATE TABLE `devices` (
   `fdb_snmp_index` tinyint(1) NOT NULL DEFAULT 0,
   `discovery` tinyint(1) NOT NULL DEFAULT 1,
   `user_acl` tinyint(1) NOT NULL DEFAULT 0,
+  `dhcp` tinyint(1) NOT NULL DEFAULT 0,
   `nagios` tinyint(1) NOT NULL DEFAULT 0,
-  `deleted` tinyint(1) NOT NULL DEFAULT 0,
   `active` tinyint(1) NOT NULL DEFAULT 1,
-  `nagios_status` varchar(10) NOT NULL DEFAULT 'UP',
-  `queue_enabled` tinyint(1) NOT NULL DEFAULT 0,
-  `connected_user_only` tinyint(1) NOT NULL DEFAULT 0,
-  `user_id` int(11) DEFAULT 0
+  `nagios_status` varchar(12) NOT NULL DEFAULT 'UP',
+  `queue_enabled` tinyint(1) NOT NULL DEFAULT 1,
+  `connected_user_only` tinyint(1) NOT NULL DEFAULT 1,
+  `user_id` int(11) DEFAULT NULL,
+  `deleted` tinyint(1) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Индексы сохранённых таблиц
---
-
---
--- Индексы таблицы `devices`
---
-ALTER TABLE `devices`
-  ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `id` (`id`),
-  ADD KEY `device_model_id` (`device_model`),
-  ADD KEY `ip` (`ip`),
-  ADD KEY `device_type` (`device_type`);
-
---
--- AUTO_INCREMENT для сохранённых таблиц
---
-
---
--- AUTO_INCREMENT для таблицы `devices`
---
-ALTER TABLE `devices`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;

docs/mysql/stat_table_dhcp_log.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `dhcp_log`
+-- Table structure for table `dhcp_log`
 --
 
 CREATE TABLE `dhcp_log` (

docs/mysql/stat_table_dns_cache.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `dns_cache`
+-- Table structure for table `dns_cache`
 --
 
 CREATE TABLE `dns_cache` (

docs/mysql/stat_table_mac_history.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `mac_history`
+-- Table structure for table `mac_history`
 --
 
 CREATE TABLE `mac_history` (

docs/mysql/stat_table_mac_vendors.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `mac_vendors`
+-- Table structure for table `mac_vendors`
 --
 
 CREATE TABLE `mac_vendors` (
@@ -18,7 +18,12 @@ CREATE TABLE `mac_vendors` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Дамп данных таблицы `mac_vendors`
+-- Truncate table before insert `mac_vendors`
+--
+
+TRUNCATE TABLE `mac_vendors`;
+--
+-- Dumping data for table `mac_vendors`
 --
 
 INSERT INTO `mac_vendors` (`id`, `oui`, `isprivate`, `companyName`, `companyAddress`, `countryCode`, `assignmentBlockSize`, `dateCreated`, `dateUpdated`) VALUES

docs/mysql/stat_table_remote_syslog.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `remote_syslog`
+-- Table structure for table `remote_syslog`
 --
 
 CREATE TABLE `remote_syslog` (

docs/mysql/stat_table_subnets.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `subnets`
+-- Table structure for table `subnets`
 --
 
 CREATE TABLE `subnets` (
@@ -22,5 +22,14 @@ CREATE TABLE `subnets` (
   `static` tinyint(1) NOT NULL DEFAULT 0,
   `dhcp_update_hostname` tinyint(1) NOT NULL DEFAULT 0,
   `discovery` tinyint(1) NOT NULL DEFAULT 1,
-  `comment` text CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+  `comment` text DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `subnets`
+--
+
+INSERT INTO `subnets` (`id`, `subnet`, `ip_int_start`, `ip_int_stop`, `dhcp_start`, `dhcp_stop`, `dhcp_lease_time`, `gateway`, `office`, `hotspot`, `vpn`, `free`, `dhcp`, `static`, `dhcp_update_hostname`, `discovery`, `comment`) VALUES
+(1, '192.168.0.0/16', 3232235520, 3232301055, 0, 0, 480, 0, 0, 0, 0, 1, 0, 0, 0, 0, 'Не считать трафик'),
+(2, '10.0.0.0/8', 167772160, 184549375, 0, 0, 480, 0, 0, 0, 0, 1, 0, 0, 0, 0, 'Не считать трафик'),
+(3, '172.16.0.0/12', 2886729728, 2887778303, 0, 0, 480, 0, 0, 0, 0, 1, 0, 0, 0, 0, 'Не считать трафик');

docs/mysql/stat_table_syslog.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `syslog`
+-- Table structure for table `syslog`
 --
 
 CREATE TABLE `syslog` (

docs/mysql/stat_table_variables.sql

@@ -2,7 +2,7 @@
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `variables`
+-- Table structure for table `variables`
 --
 
 CREATE TABLE `variables` (

docs/mysql/stat_table_vendors.sql

@@ -1,19 +1,22 @@
+
+-- --------------------------------------------------------
+
 --
--- Структура таблицы `vendors`
+-- Table structure for table `vendors`
 --
 
 CREATE TABLE `vendors` (
   `id` int(11) NOT NULL,
-  `name` varchar(40) NOT NULL
+  `name` varchar(80) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Очистить таблицу перед добавлением данных `vendors`
+-- Truncate table before insert `vendors`
 --
 
 TRUNCATE TABLE `vendors`;
 --
--- Дамп данных таблицы `vendors`
+-- Dumping data for table `vendors`
 --
 
 INSERT INTO `vendors` (`id`, `name`) VALUES
@@ -49,10 +52,5 @@ INSERT INTO `vendors` (`id`, `name`) VALUES
 (33, 'QSC'),
 (34, 'Projectiondesign'),
 (35, 'Lenovo'),
-(36, 'SIPOWER');
-
---
-ALTER TABLE `vendors`
-  ADD PRIMARY KEY (`id`);
-ALTER TABLE `vendors`
-  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10000;
+(36, 'SIPOWER'),
+(37, 'TP-Link');

updates/20210330/db-patch-mysql-ou.sql

@@ -20,3 +20,4 @@ INSERT INTO `vendors` (`id`, `name`) VALUES ('34', 'Projectiondesign');
 INSERT INTO `vendors` (`id`, `name`) VALUES ('35', 'Lenovo');
 ALTER TABLE `User_auth` ADD `firmware` VARCHAR(100) NULL DEFAULT NULL AFTER `device_model_id`;
 ALTER TABLE `devices` ADD `firmware` VARCHAR(100) NULL DEFAULT NULL AFTER `device_model_id`;
+ALTER TABLE `vendors` CHANGE `name` `name` VARCHAR(80) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;