Browse code

removed tables for server monitoring - no more needed

Karel Kozlik authored on 10/04/2006 14:39:57
Showing 10 changed files
... ...
@@ -41,10 +41,7 @@
41 41
     <!-- Table containing list of trusted peers -->
42 42
     <xi:include href="trusted.xml"/>
43 43
 
44
-    <!-- SER monitoring data (used by serweb -->
45
-    <xi:include href="server_monitoring.xml"/>
46
-    <xi:include href="server_monitoring_agg.xml"/>
47
-
44
+    <!-- Table containing phonebook (used by serweb -->
48 45
     <xi:include href="phonebook.xml"/>
49 46
 
50 47
     <!-- Least Cost Routing related tables -->
51 48
deleted file mode 100644
... ...
@@ -1,50 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
3
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
4
-
5
-<!ENTITY % entities SYSTEM "entities.xml">
6
-%entities;
7
-
8
-]>
9
-
10
-<table role="serweb" xmlns:my="http://iptel.org/dbschema/mysql">
11
-    <name>server_monitoring</name>
12
-    <version>1</version>
13
-
14
-    <column>
15
-	<name>time</name>
16
-	<type>datetime</type>
17
-	<default>1970-01-01 00:00:00</default>
18
-    </column>
19
-
20
-    <column id="sm.id">
21
-	<name>id</name>
22
-	<type>int</type>
23
-	<default>0</default>
24
-    </column>
25
-
26
-    <column id="sm.param">
27
-	<name>param</name>
28
-	<type>string</type>
29
-	<default></default>
30
-	<size>32</size>
31
-    </column>
32
-
33
-    <column>
34
-	<name>value</name>
35
-	<type>int</type>
36
-	<default>0</default>
37
-    </column>
38
-
39
-    <column>
40
-	<name>increment</name>
41
-	<type>int</type>
42
-	<default>0</default>
43
-    </column>
44
-
45
-    <index>
46
-	<name>sm_idx1</name>
47
-	<colref linkend="sm.id"/>
48
-	<colref linkend="sm.param"/>
49
-    </index>
50
-</table>
51 0
deleted file mode 100644
... ...
@@ -1,97 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
3
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
4
-
5
-<!ENTITY % entities SYSTEM "entities.xml">
6
-%entities;
7
-
8
-]>
9
-
10
-<table role="serweb">
11
-    <name>server_monitoring_agg</name>
12
-    <version>1</version>
13
-
14
-    <column id="smagg.param">
15
-	<name>param</name>
16
-	<type>string</type>
17
-	<default></default>
18
-	<size>32</size>
19
-    </column>
20
-
21
-    <column>
22
-	<name>s_value</name>
23
-	<type>int</type>
24
-	<default>0</default>
25
-    </column>
26
-
27
-    <column>
28
-	<name>s_increment</name>
29
-	<type>int</type>
30
-	<default>0</default>
31
-    </column>
32
-
33
-    <column>
34
-	<name>last_aggregated_increment</name>
35
-	<type>int</type>
36
-	<default>0</default>
37
-    </column>
38
-
39
-    <column>
40
-	<name>av</name>
41
-	<type>double</type>
42
-	<default>0</default>
43
-    </column>
44
-
45
-    <column>
46
-	<name>mv</name>
47
-	<type>int</type>
48
-	<default>0</default>
49
-    </column>
50
-
51
-    <column>
52
-	<name>ad</name>
53
-	<type>double</type>
54
-	<default>0</default>
55
-    </column>
56
-
57
-    <column>
58
-	<name>lv</name>
59
-	<type>int</type>
60
-	<default>0</default>
61
-    </column>
62
-
63
-    <column>
64
-	<name>min_val</name>
65
-	<type>int</type>
66
-	<default>0</default>
67
-    </column>
68
-
69
-    <column>
70
-	<name>max_val</name>
71
-	<type>int</type>
72
-	<default>0</default>
73
-    </column>
74
-
75
-    <column>
76
-	<name>min_inc</name>
77
-	<type>int</type>
78
-	<default>0</default>
79
-    </column>
80
-
81
-    <column>
82
-	<name>max_inc</name>
83
-	<type>int</type>
84
-	<default>0</default>
85
-    </column>
86
-
87
-    <column>
88
-	<name>lastupdate</name>
89
-	<type>datetime</type>
90
-	<default>1970-01-01 00:00:00</default>
91
-    </column>
92
-
93
-    <index>
94
-	<name>smagg_idx1</name>
95
-	<colref linkend="smagg.param"/>
96
-    </index>
97
-</table>
... ...
@@ -70,19 +70,11 @@
70 70
 	<value col="tn"><xi:include href="uri.xml" xpointer="xpointer(table/name/text())"/></value>
71 71
 	<value col="tv"><xi:include href="uri.xml" xpointer="xpointer(table/version/text())"/></value>
72 72
     </row>
73
-    <row>
74
-	<value col="tn"><xi:include href="server_monitoring.xml" xpointer="xpointer(table/name/text())"/></value>
75
-	<value col="tv"><xi:include href="server_monitoring.xml" xpointer="xpointer(table/version/text())"/></value>
76
-    </row>
77 73
     <row>
78 74
 	<value col="tn"><xi:include href="trusted.xml" xpointer="xpointer(table/name/text())"/></value>
79 75
 	<value col="tv"><xi:include href="trusted.xml" xpointer="xpointer(table/version/text())"/></value>
80 76
 	
81 77
     </row>
82
-    <row>
83
-	<value col="tn"><xi:include href="server_monitoring_agg.xml" xpointer="xpointer(table/name/text())"/></value>
84
-	<value col="tv"><xi:include href="server_monitoring_agg.xml" xpointer="xpointer(table/version/text())"/></value>
85
-    </row>
86 78
     <row>
87 79
 	<value col="tn"><xi:include href="speed_dial.xml" xpointer="xpointer(table/name/text())"/></value>
88 80
 	<value col="tv"><xi:include href="speed_dial.xml" xpointer="xpointer(table/version/text())"/></value>
89 81
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-time(int) id(int) param(str) value(int) increment(int) 
2 0
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-param(str) s_value(int) s_increment(int) last_aggregated_increment(int) av(double) mv(int) ad(double) lv(int) min_val(int) max_val(int) min_inc(int) max_inc(int) lastupdate(int) 
... ...
@@ -11,9 +11,7 @@ user_attrs:3
11 11
 phonebook:1
12 12
 silo:4
13 13
 uri:2
14
-server_monitoring:1
15 14
 trusted:1
16
-server_monitoring_agg:1
17 15
 speed_dial:2
18 16
 sd_attrs:1
19 17
 gw:3
... ...
@@ -18,9 +18,7 @@ INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
18 18
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
19 19
 INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
20 20
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
21
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
22 21
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
23
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring_agg', '1');
24 22
 INSERT INTO version (table_name, table_version) VALUES ('speed_dial', '2');
25 23
 INSERT INTO version (table_name, table_version) VALUES ('sd_attrs', '1');
26 24
 INSERT INTO version (table_name, table_version) VALUES ('gw', '3');
... ...
@@ -213,32 +211,6 @@ CREATE TABLE trusted (
213 211
     UNIQUE KEY trusted_idx (src_ip, proto, from_pattern)
214 212
 );
215 213
 
216
-CREATE TABLE server_monitoring (
217
-    time DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
218
-    id INT NOT NULL DEFAULT '0',
219
-    param VARCHAR(32) NOT NULL DEFAULT '',
220
-    value INT NOT NULL DEFAULT '0',
221
-    increment INT NOT NULL DEFAULT '0',
222
-    KEY sm_idx1 (id, param)
223
-);
224
-
225
-CREATE TABLE server_monitoring_agg (
226
-    param VARCHAR(32) NOT NULL DEFAULT '',
227
-    s_value INT NOT NULL DEFAULT '0',
228
-    s_increment INT NOT NULL DEFAULT '0',
229
-    last_aggregated_increment INT NOT NULL DEFAULT '0',
230
-    av DOUBLE NOT NULL DEFAULT '0',
231
-    mv INT NOT NULL DEFAULT '0',
232
-    ad DOUBLE NOT NULL DEFAULT '0',
233
-    lv INT NOT NULL DEFAULT '0',
234
-    min_val INT NOT NULL DEFAULT '0',
235
-    max_val INT NOT NULL DEFAULT '0',
236
-    min_inc INT NOT NULL DEFAULT '0',
237
-    max_inc INT NOT NULL DEFAULT '0',
238
-    lastupdate DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
239
-    KEY smagg_idx1 (param)
240
-);
241
-
242 214
 CREATE TABLE phonebook (
243 215
     id INT AUTO_INCREMENT NOT NULL,
244 216
     uid VARCHAR(64) NOT NULL,
... ...
@@ -15,9 +15,7 @@ INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
15 15
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
16 16
 INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
17 17
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
18
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
19 18
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
20
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring_agg', '1');
21 19
 INSERT INTO version (table_name, table_version) VALUES ('speed_dial', '2');
22 20
 INSERT INTO version (table_name, table_version) VALUES ('sd_attrs', '1');
23 21
 INSERT INTO version (table_name, table_version) VALUES ('gw', '3');
... ...
@@ -208,30 +206,6 @@ CREATE TABLE trusted (
208 206
     trusted_idx UNIQUE (src_ip, proto, from_pattern, )
209 207
 );
210 208
 
211
-CREATE TABLE server_monitoring (
212
-    time datetime NOT NULL DEFAULT '1970-01-01 00:00:00',
213
-    id int NOT NULL DEFAULT '0',
214
-    param string(32) NOT NULL DEFAULT '',
215
-    value int NOT NULL DEFAULT '0',
216
-    increment int NOT NULL DEFAULT '0'
217
-);
218
-
219
-CREATE TABLE server_monitoring_agg (
220
-    param string(32) NOT NULL DEFAULT '',
221
-    s_value int NOT NULL DEFAULT '0',
222
-    s_increment int NOT NULL DEFAULT '0',
223
-    last_aggregated_increment int NOT NULL DEFAULT '0',
224
-    av double NOT NULL DEFAULT '0',
225
-    mv int NOT NULL DEFAULT '0',
226
-    ad double NOT NULL DEFAULT '0',
227
-    lv int NOT NULL DEFAULT '0',
228
-    min_val int NOT NULL DEFAULT '0',
229
-    max_val int NOT NULL DEFAULT '0',
230
-    min_inc int NOT NULL DEFAULT '0',
231
-    max_inc int NOT NULL DEFAULT '0',
232
-    lastupdate datetime NOT NULL DEFAULT '1970-01-01 00:00:00'
233
-);
234
-
235 209
 CREATE TABLE phonebook (
236 210
     id int NOT NULL,
237 211
     uid string(64) NOT NULL,
... ...
@@ -18,9 +18,7 @@ INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
18 18
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
19 19
 INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
20 20
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
21
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
22 21
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
23
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring_agg', '1');
24 22
 INSERT INTO version (table_name, table_version) VALUES ('speed_dial', '2');
25 23
 INSERT INTO version (table_name, table_version) VALUES ('sd_attrs', '1');
26 24
 INSERT INTO version (table_name, table_version) VALUES ('gw', '3');
... ...
@@ -218,34 +216,6 @@ CREATE TABLE trusted (
218 216
     CONSTRAINT trusted_idx UNIQUE (src_ip, proto, from_pattern)
219 217
 );
220 218
 
221
-CREATE TABLE server_monitoring (
222
-    time TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00',
223
-    id INTEGER NOT NULL DEFAULT '0',
224
-    param VARCHAR(32) NOT NULL DEFAULT '',
225
-    value INTEGER NOT NULL DEFAULT '0',
226
-    increment INTEGER NOT NULL DEFAULT '0'
227
-);
228
-
229
-CREATE INDEX sm_idx1 ON server_monitoring (id, param);
230
-
231
-CREATE TABLE server_monitoring_agg (
232
-    param VARCHAR(32) NOT NULL DEFAULT '',
233
-    s_value INTEGER NOT NULL DEFAULT '0',
234
-    s_increment INTEGER NOT NULL DEFAULT '0',
235
-    last_aggregated_increment INTEGER NOT NULL DEFAULT '0',
236
-    av DOUBLE PRECISION NOT NULL DEFAULT '0',
237
-    mv INTEGER NOT NULL DEFAULT '0',
238
-    ad DOUBLE PRECISION NOT NULL DEFAULT '0',
239
-    lv INTEGER NOT NULL DEFAULT '0',
240
-    min_val INTEGER NOT NULL DEFAULT '0',
241
-    max_val INTEGER NOT NULL DEFAULT '0',
242
-    min_inc INTEGER NOT NULL DEFAULT '0',
243
-    max_inc INTEGER NOT NULL DEFAULT '0',
244
-    lastupdate TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00'
245
-);
246
-
247
-CREATE INDEX smagg_idx1 ON server_monitoring_agg (param);
248
-
249 219
 CREATE TABLE phonebook (
250 220
     id SERIAL NOT NULL,
251 221
     uid VARCHAR(64) NOT NULL,
... ...
@@ -584,5 +554,5 @@ CREATE TABLE customers (
584 554
 );
585 555
 
586 556
 
587
-GRANT ALL ON version,acc,missed_calls,credentials,attr_types,global_attrs,domain_attrs,user_attrs,domain,location,trusted,server_monitoring,server_monitoring_agg,phonebook,gw,gw_grp,lcr,grp,silo,uri,speed_dial,sd_attrs,presentity,presentity_notes,presentity_persons,presentity_contact,watcherinfo,tuple_notes,offline_winfo,rls_subscription,rls_vs,rls_vs_names,i18n,pdt,customers TO ser;
588
-GRANT SELECT ON version,acc,missed_calls,credentials,attr_types,global_attrs,domain_attrs,user_attrs,domain,location,trusted,server_monitoring,server_monitoring_agg,phonebook,gw,gw_grp,lcr,grp,silo,uri,speed_dial,sd_attrs,presentity,presentity_notes,presentity_persons,presentity_contact,watcherinfo,tuple_notes,offline_winfo,rls_subscription,rls_vs,rls_vs_names,i18n,pdt,customers TO serro;
557
+GRANT ALL ON version,acc,missed_calls,credentials,attr_types,global_attrs,domain_attrs,user_attrs,domain,location,trusted,phonebook,gw,gw_grp,lcr,grp,silo,uri,speed_dial,sd_attrs,presentity,presentity_notes,presentity_persons,presentity_contact,watcherinfo,tuple_notes,offline_winfo,rls_subscription,rls_vs,rls_vs_names,i18n,pdt,customers TO ser;
558
+GRANT SELECT ON version,acc,missed_calls,credentials,attr_types,global_attrs,domain_attrs,user_attrs,domain,location,trusted,phonebook,gw,gw_grp,lcr,grp,silo,uri,speed_dial,sd_attrs,presentity,presentity_notes,presentity_persons,presentity_contact,watcherinfo,tuple_notes,offline_winfo,rls_subscription,rls_vs,rls_vs_names,i18n,pdt,customers TO serro;