From 4f3b42be54f97d618c0f6326cc8fb34893ec3dcf Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 2 Nov 2011 18:38:06 +0000
Subject: [PATCH] database updates :)

git-svn-id: http://www.observium.org/svn/observer/trunk@2710 61d68cd4-352d-0410-923a-c4978735b2b8
---
 database-schema.sql | 14 ++++++++++++--
 database-update.sql | 15 +++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/database-schema.sql b/database-schema.sql
index f2f94178a5..63f6a305e2 100644
--- a/database-schema.sql
+++ b/database-schema.sql
@@ -99,13 +99,23 @@ CREATE TABLE IF NOT EXISTS `bills` (
   `bill_cdr` int(11) DEFAULT NULL,
   `bill_day` int(11) NOT NULL DEFAULT '1',
   `bill_gb` int(11) DEFAULT NULL,
+  `rate_95th_in` int(11) NOT NULL,
+  `rate_95th_out` int(11) NOT NULL,
+  `rate_95th` int(11) NOT NULL,
+  `dir_95th` varchar(3) NOT NULL,
+  `total_data` int(11) NOT NULL,
+  `total_data_in` int(11) NOT NULL,
+  `total_data_out` int(11) NOT NULL,
+  `rate_average_in` int(11) NOT NULL,
+  `rate_average_out` int(11) NOT NULL,
+  `rate_average` int(11) NOT NULL,
+  `bill_last_calc` datetime NOT NULL,
   `bill_custid` varchar(64) NOT NULL,
   `bill_ref` varchar(64) NOT NULL,
   `bill_notes` varchar(256) NOT NULL,
   `bill_autoadded` tinyint(1) NOT NULL,
   UNIQUE KEY `bill_id` (`bill_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
-
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ;
 -- --------------------------------------------------------
 
 --
diff --git a/database-update.sql b/database-update.sql
index 89820c3449..90ffb33dfa 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -6,5 +6,16 @@ ALTER TABLE `ports` ADD UNIQUE  `device_ifIndex` (  `device_id` ,  `ifIndex` );
 ALTER TABLE `devices` CHANGE  `port`  `port` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT  '161';
 CREATE TABLE IF NOT EXISTS `ipsec_tunnels` (  `tunnel_id` int(11) NOT NULL AUTO_INCREMENT,  `device_id` int(11) NOT NULL,  `peer_port` int(11) NOT NULL,  `peer_addr` varchar(64) COLLATE utf8_unicode_ci NOT NULL,  `local_addr` varchar(64) COLLATE utf8_unicode_ci NOT NULL,  `local_port` int(11) NOT NULL,  `tunnel_name` varchar(96) COLLATE utf8_unicode_ci NOT NULL,  `tunnel_status` varchar(11) COLLATE utf8_unicode_ci NOT NULL,  PRIMARY KEY (`tunnel_id`),  UNIQUE KEY `unique_index` (`device_id`,`peer_addr`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 ALTER TABLE `syslog` ADD INDEX ( `program` );
-ALTER TABLE  `devices` ADD  `sysObjectID` VARCHAR( 64 ) NULL DEFAULT NULL AFTER  `bgpLocalAs`;
-ALTER TABLE  `ports` CHANGE  `ifSpeed`  `ifSpeed` BIGINT NULL DEFAULT NULL;
+ALTER TABLE `devices` ADD  `sysObjectID` VARCHAR( 64 ) NULL DEFAULT NULL AFTER  `bgpLocalAs`;
+ALTER TABLE `ports` CHANGE  `ifSpeed`  `ifSpeed` BIGINT NULL DEFAULT NULL;
+ALTER TABLE `bills` ADD `rate_95th_in` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `rate_95th_out` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `rate_95th` int(11) NOT NULL;
+ALTER TABLE `bills` ADD `dir_95th` varchar(3) NOT NULL;
+ALTER TABLE `total_data` int(11) NOT NULL;
+ALTER TABLE `total_data_in` int(11) NOT NULL;
+ALTER TABLE `total_data_out` int(11) NOT NULL;
+ALTER TABLE `rate_average_in` int(11) NOT NULL;
+ALTER TABLE `rate_average_out` int(11) NOT NULL;
+ALTER TABLE `rate_average` int(11) NOT NULL;
+ALTER TABLE `bill_last_calc` datetime NOT NULL;