SQL baseline cleanup

sql/baseline/arnold.sql

@@ -22,6 +22,8 @@ orgid VARCHAR,
 determined CHAR(1), -- set to y if this is mac/port combo is blocked with the -d option.
 fromvlan INT, -- original vlan on port before change (only on vlanchange)
 tovlan INT, -- vlan on port after change (only on vlanchange)
+textual_interface VARCHAR DEFAULT '', -- for storing textual representation of the interface when detaining
+
 UNIQUE (mac,swportid)
 );
 
@@ -41,7 +43,9 @@ username VARCHAR NOT NULL
 CREATE TABLE quarantine_vlans (
 quarantineid SERIAL PRIMARY KEY,
 vlan INT,
-description VARCHAR
+description VARCHAR,
+
+CONSTRAINT quarantine_vlan_unique UNIQUE (vlan)
 );
 
 -- A block, of lack of better name, is a run where we do automatic blocking 
@@ -63,19 +67,3 @@ activeonvlans VARCHAR, -- a string with comma-separated vlan-numbers
 detainmenttype VARCHAR CHECK (detainmenttype='disable' OR detainmenttype='quarantine'), -- type of detainment to try
 quarantineid INT REFERENCES quarantine_vlans ON UPDATE CASCADE ON DELETE CASCADE
 );
-
--- Create field for storing textual representation of the interface when detaining
-
-ALTER table arnold.identity ADD textual_interface VARCHAR DEFAULT '';
-
-
--- Fix uniqueness on quarantine vlans
-
-DELETE FROM quarantine_vlans WHERE quarantineid in (
-  SELECT q2.quarantineid
-  FROM quarantine_vlans q1
-  JOIN quarantine_vlans q2
-    ON (q1.vlan = q2.vlan AND q1.quarantineid < q2.quarantineid)
-    ORDER BY q1.quarantineid);
-
-ALTER TABLE quarantine_vlans ADD CONSTRAINT quarantine_vlan_unique UNIQUE (vlan);

sql/baseline/manage2.sql

@@ -23,8 +23,20 @@ CREATE TABLE manage.macwatch (
   CONSTRAINT macwatch_unique_mac UNIQUE (mac)
 );
 
--- Create table for images
 
+-- Registry of macwatch matches
+-- (since watch rules may have wildcards and/or mac prefixes)
+CREATE TABLE macwatch_match (
+  id SERIAL PRIMARY KEY,
+  macwatch INT NOT NULL REFERENCES macwatch(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  cam INT NOT NULL REFERENCES cam(camid) ON DELETE CASCADE ON UPDATE CASCADE,
+  posted TIMESTAMP DEFAULT NOW()
+);
+
+
+------------------------------------------------------------------------------
+-- Create table for room images
+------------------------------------------------------------------------------
 CREATE TABLE image (
   imageid SERIAL PRIMARY KEY,
   roomid VARCHAR REFERENCES room(roomid) NOT NULL,
@@ -36,22 +48,9 @@ CREATE TABLE image (
   priority INT
 );
 
-
-INSERT INTO subsystem (
-  SELECT 'macwatch' AS name
-  WHERE NOT EXISTS (
-    SELECT name FROM subsystem WHERE name='macwatch'));
-
--- Added because macwatch may use mac-address prefixes
-CREATE TABLE macwatch_match(
-  id SERIAL PRIMARY KEY,
-  macwatch INT NOT NULL REFERENCES macwatch(id) ON DELETE CASCADE ON UPDATE CASCADE,
-  cam INT NOT NULL REFERENCES cam(camid) ON DELETE CASCADE ON UPDATE CASCADE,
-  posted TIMESTAMP DEFAULT NOW()
-);
-
+------------------------------------------------------------------------------
 -- Create basic token storage for api tokens
-
+------------------------------------------------------------------------------
 CREATE TABLE apitoken (
   id SERIAL PRIMARY KEY,
   token VARCHAR not null,
@@ -61,10 +60,14 @@ CREATE TABLE apitoken (
   created TIMESTAMP DEFAULT now(),
   last_used TIMESTAMP,
   comment TEXT,
-  revoked BOOLEAN default FALSE
+  revoked BOOLEAN default FALSE,
+  endpoints hstore
 );
 
 
+------------------------------------------------------------------------------
+-- Threshold rules and related functions
+------------------------------------------------------------------------------
 CREATE TABLE manage.thresholdrule (
   id SERIAL PRIMARY KEY,
   target VARCHAR NOT NULL,
@@ -82,22 +85,6 @@ CREATE TABLE manage.thresholdrule (
 
 );
 
-CREATE TABLE manage.alerthist_ack (
-  alert_id INTEGER PRIMARY KEY NOT NULL,
-  account_id INTEGER NOT NULL,
-  comment VARCHAR DEFAULT NULL,
-  date TIMESTAMPTZ DEFAULT NOW(),
-
-  CONSTRAINT alerthistory_ack_alert FOREIGN KEY (alert_id)
-             REFERENCES manage.alerthist (alerthistid)
-             ON UPDATE CASCADE ON DELETE CASCADE,
-
-  CONSTRAINT alerthistory_ack_user FOREIGN KEY (account_id)
-             REFERENCES profiles.account (id)
-             ON UPDATE CASCADE ON DELETE CASCADE
-
-);
-
 -- automatically close thresholdState when threshold rules are removed
 CREATE OR REPLACE FUNCTION close_thresholdstate_on_thresholdrule_delete()
 RETURNS TRIGGER AS $$
@@ -120,4 +107,23 @@ CREATE TRIGGER trig_close_thresholdstate_on_thresholdrule_delete
     AFTER UPDATE OR DELETE ON manage.thresholdrule
     FOR EACH ROW
     EXECUTE PROCEDURE close_thresholdstate_on_thresholdrule_delete();
-ALTER TABLE apitoken ADD COLUMN endpoints hstore;
+
+
+------------------------------------------------------------------------------
+-- Alerthist acknowledgements
+------------------------------------------------------------------------------
+CREATE TABLE manage.alerthist_ack (
+  alert_id INTEGER PRIMARY KEY NOT NULL,
+  account_id INTEGER NOT NULL,
+  comment VARCHAR DEFAULT NULL,
+  date TIMESTAMPTZ DEFAULT NOW(),
+
+  CONSTRAINT alerthistory_ack_alert FOREIGN KEY (alert_id)
+             REFERENCES manage.alerthist (alerthistid)
+             ON UPDATE CASCADE ON DELETE CASCADE,
+
+  CONSTRAINT alerthistory_ack_user FOREIGN KEY (account_id)
+             REFERENCES profiles.account (id)
+             ON UPDATE CASCADE ON DELETE CASCADE
+
+);