removed tables for server monitoring - no more needed

db/schema/ser.xml

@@ -41,10 +41,7 @@
     <!-- Table containing list of trusted peers -->
     <xi:include href="trusted.xml"/>
 
-    <!-- SER monitoring data (used by serweb -->
-    <xi:include href="server_monitoring.xml"/>
-    <xi:include href="server_monitoring_agg.xml"/>
-
+    <!-- Table containing phonebook (used by serweb -->
     <xi:include href="phonebook.xml"/>
 
     <!-- Least Cost Routing related tables -->

db/schema/server_monitoring.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table role="serweb" xmlns:my="http://iptel.org/dbschema/mysql">
-    <name>server_monitoring</name>
-    <version>1</version>
-
-    <column>
-	<name>time</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-
-    <column id="sm.id">
-	<name>id</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column id="sm.param">
-	<name>param</name>
-	<type>string</type>
-	<default></default>
-	<size>32</size>
-    </column>
-
-    <column>
-	<name>value</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>increment</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <index>
-	<name>sm_idx1</name>
-	<colref linkend="sm.id"/>
-	<colref linkend="sm.param"/>
-    </index>
-</table>

db/schema/server_monitoring_agg.xml

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table role="serweb">
-    <name>server_monitoring_agg</name>
-    <version>1</version>
-
-    <column id="smagg.param">
-	<name>param</name>
-	<type>string</type>
-	<default></default>
-	<size>32</size>
-    </column>
-
-    <column>
-	<name>s_value</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>s_increment</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>last_aggregated_increment</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>av</name>
-	<type>double</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>mv</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>ad</name>
-	<type>double</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>lv</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>min_val</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>max_val</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>min_inc</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>max_inc</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-
-    <column>
-	<name>lastupdate</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-
-    <index>
-	<name>smagg_idx1</name>
-	<colref linkend="smagg.param"/>
-    </index>
-</table>

db/schema/version.xml

@@ -70,19 +70,11 @@
 	<value col="tn"><xi:include href="uri.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="uri.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
-    <row>
-	<value col="tn"><xi:include href="server_monitoring.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="server_monitoring.xml" xpointer="xpointer(table/version/text())"/></value>
-    </row>
     <row>
 	<value col="tn"><xi:include href="trusted.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="trusted.xml" xpointer="xpointer(table/version/text())"/></value>
 	
     </row>
-    <row>
-	<value col="tn"><xi:include href="server_monitoring_agg.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="server_monitoring_agg.xml" xpointer="xpointer(table/version/text())"/></value>
-    </row>
     <row>
 	<value col="tn"><xi:include href="speed_dial.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="speed_dial.xml" xpointer="xpointer(table/version/text())"/></value>

scripts/dbtext/ser_db/server_monitoring

@@ -1 +0,0 @@
-time(int) id(int) param(str) value(int) increment(int) 

scripts/dbtext/ser_db/server_monitoring_agg

@@ -1 +0,0 @@
-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) 

scripts/dbtext/ser_db/version

@@ -11,9 +11,7 @@ user_attrs:3
 phonebook:1
 silo:4
 uri:2
-server_monitoring:1
 trusted:1
-server_monitoring_agg:1
 speed_dial:2
 sd_attrs:1
 gw:3

scripts/mysql/my_create.sql

@@ -18,9 +18,7 @@ INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
 INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring_agg', '1');
 INSERT INTO version (table_name, table_version) VALUES ('speed_dial', '2');
 INSERT INTO version (table_name, table_version) VALUES ('sd_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('gw', '3');
@@ -213,32 +211,6 @@ CREATE TABLE trusted (
     UNIQUE KEY trusted_idx (src_ip, proto, from_pattern)
 );
 
-CREATE TABLE server_monitoring (
-    time DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
-    id INT NOT NULL DEFAULT '0',
-    param VARCHAR(32) NOT NULL DEFAULT '',
-    value INT NOT NULL DEFAULT '0',
-    increment INT NOT NULL DEFAULT '0',
-    KEY sm_idx1 (id, param)
-);
-
-CREATE TABLE server_monitoring_agg (
-    param VARCHAR(32) NOT NULL DEFAULT '',
-    s_value INT NOT NULL DEFAULT '0',
-    s_increment INT NOT NULL DEFAULT '0',
-    last_aggregated_increment INT NOT NULL DEFAULT '0',
-    av DOUBLE NOT NULL DEFAULT '0',
-    mv INT NOT NULL DEFAULT '0',
-    ad DOUBLE NOT NULL DEFAULT '0',
-    lv INT NOT NULL DEFAULT '0',
-    min_val INT NOT NULL DEFAULT '0',
-    max_val INT NOT NULL DEFAULT '0',
-    min_inc INT NOT NULL DEFAULT '0',
-    max_inc INT NOT NULL DEFAULT '0',
-    lastupdate DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
-    KEY smagg_idx1 (param)
-);
-
 CREATE TABLE phonebook (
     id INT AUTO_INCREMENT NOT NULL,
     uid VARCHAR(64) NOT NULL,

scripts/oracle/or_create.sql

@@ -15,9 +15,7 @@ INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
 INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring_agg', '1');
 INSERT INTO version (table_name, table_version) VALUES ('speed_dial', '2');
 INSERT INTO version (table_name, table_version) VALUES ('sd_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('gw', '3');
@@ -208,30 +206,6 @@ CREATE TABLE trusted (
     trusted_idx UNIQUE (src_ip, proto, from_pattern, )
 );
 
-CREATE TABLE server_monitoring (
-    time datetime NOT NULL DEFAULT '1970-01-01 00:00:00',
-    id int NOT NULL DEFAULT '0',
-    param string(32) NOT NULL DEFAULT '',
-    value int NOT NULL DEFAULT '0',
-    increment int NOT NULL DEFAULT '0'
-);
-
-CREATE TABLE server_monitoring_agg (
-    param string(32) NOT NULL DEFAULT '',
-    s_value int NOT NULL DEFAULT '0',
-    s_increment int NOT NULL DEFAULT '0',
-    last_aggregated_increment int NOT NULL DEFAULT '0',
-    av double NOT NULL DEFAULT '0',
-    mv int NOT NULL DEFAULT '0',
-    ad double NOT NULL DEFAULT '0',
-    lv int NOT NULL DEFAULT '0',
-    min_val int NOT NULL DEFAULT '0',
-    max_val int NOT NULL DEFAULT '0',
-    min_inc int NOT NULL DEFAULT '0',
-    max_inc int NOT NULL DEFAULT '0',
-    lastupdate datetime NOT NULL DEFAULT '1970-01-01 00:00:00'
-);
-
 CREATE TABLE phonebook (
     id int NOT NULL,
     uid string(64) NOT NULL,

scripts/postgres/pg_create.sql

@@ -18,9 +18,7 @@ INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
 INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
-INSERT INTO version (table_name, table_version) VALUES ('server_monitoring_agg', '1');
 INSERT INTO version (table_name, table_version) VALUES ('speed_dial', '2');
 INSERT INTO version (table_name, table_version) VALUES ('sd_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('gw', '3');
@@ -218,34 +216,6 @@ CREATE TABLE trusted (
     CONSTRAINT trusted_idx UNIQUE (src_ip, proto, from_pattern)
 );
 
-CREATE TABLE server_monitoring (
-    time TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00',
-    id INTEGER NOT NULL DEFAULT '0',
-    param VARCHAR(32) NOT NULL DEFAULT '',
-    value INTEGER NOT NULL DEFAULT '0',
-    increment INTEGER NOT NULL DEFAULT '0'
-);
-
-CREATE INDEX sm_idx1 ON server_monitoring (id, param);
-
-CREATE TABLE server_monitoring_agg (
-    param VARCHAR(32) NOT NULL DEFAULT '',
-    s_value INTEGER NOT NULL DEFAULT '0',
-    s_increment INTEGER NOT NULL DEFAULT '0',
-    last_aggregated_increment INTEGER NOT NULL DEFAULT '0',
-    av DOUBLE PRECISION NOT NULL DEFAULT '0',
-    mv INTEGER NOT NULL DEFAULT '0',
-    ad DOUBLE PRECISION NOT NULL DEFAULT '0',
-    lv INTEGER NOT NULL DEFAULT '0',
-    min_val INTEGER NOT NULL DEFAULT '0',
-    max_val INTEGER NOT NULL DEFAULT '0',
-    min_inc INTEGER NOT NULL DEFAULT '0',
-    max_inc INTEGER NOT NULL DEFAULT '0',
-    lastupdate TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00'
-);
-
-CREATE INDEX smagg_idx1 ON server_monitoring_agg (param);
-
 CREATE TABLE phonebook (
     id SERIAL NOT NULL,
     uid VARCHAR(64) NOT NULL,
@@ -584,5 +554,5 @@ CREATE TABLE customers (
 );
 
 
-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;
-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;
+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;
+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;