aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.rst2
-rw-r--r--ansible/roles/web/tasks/main.yml1
-rw-r--r--build/schema.sql361
-rwxr-xr-xweb/api/public/distro-tree8
-rwxr-xr-xweb/api/public/switches7
-rwxr-xr-xweb/api/read/distro-management31
-rwxr-xr-xweb/api/read/networks15
-rwxr-xr-xweb/api/read/oplog9
-rwxr-xr-xweb/api/read/switches-management27
-rwxr-xr-xweb/api/read/template-list8
-rwxr-xr-xweb/api/write/linknet-add32
-rwxr-xr-xweb/api/write/network-add49
-rwxr-xr-xweb/api/write/networks (renamed from web/api/write/network-update)21
-rwxr-xr-xweb/api/write/switch-add94
-rwxr-xr-xweb/api/write/switches (renamed from web/api/write/switch-update)2
-rw-r--r--web/index.html31
-rw-r--r--web/js/nms-info-box.js20
-rw-r--r--web/js/nms-map-handlers.js150
-rw-r--r--web/js/nms-map.js3
-rw-r--r--web/js/nms-time.js6
-rw-r--r--web/js/nms.js11
21 files changed, 392 insertions, 496 deletions
diff --git a/README.rst b/README.rst
index 68a1f7b..9a75c6a 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ Some facts from The Gathering 2016:
- Active network devices at 2016-03-22T12:00:00: 206
- Active network devices at 2016-03-23T08:00:00: 346
- Active network devices at 2016-03-23T20:00:00: 6467
-- 180+ switches and routers. Pinged seceral times per second. Polled for
+- 180+ switches and routers. Pinged several times per second. Polled for
SNMP every minute. Every reply (or lack thereof) is kept.
- Collected roughly 300 million database rows, or 30GB of data in postgresql.
- Public NMS and API provided to all participants and the world at large.
diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml
index d05c6db..dce3f4c 100644
--- a/ansible/roles/web/tasks/main.yml
+++ b/ansible/roles/web/tasks/main.yml
@@ -30,7 +30,6 @@
- perl-modules
- libfreezethaw-perl
- apache2
- - libapache2-mod-proxy-html
- libxml2-dev
- build-essential
- cpanminus
diff --git a/build/schema.sql b/build/schema.sql
index 41d513d..9288098 100644
--- a/build/schema.sql
+++ b/build/schema.sql
@@ -2,12 +2,18 @@
-- PostgreSQL database dump
--
+-- Dumped from database version 9.6.10
+-- Dumped by pg_dump version 9.6.10
+
SET statement_timeout = 0;
SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
SET check_function_bodies = false;
SET client_min_messages = warning;
+SET row_security = off;
--
-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner:
@@ -23,13 +29,11 @@ CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-SET search_path = public, pg_catalog;
-
--
-- Name: comment_state; Type: TYPE; Schema: public; Owner: nms
--
-CREATE TYPE comment_state AS ENUM (
+CREATE TYPE public.comment_state AS ENUM (
'active',
'inactive',
'persist',
@@ -37,17 +41,17 @@ CREATE TYPE comment_state AS ENUM (
);
-ALTER TYPE comment_state OWNER TO nms;
+ALTER TYPE public.comment_state OWNER TO nms;
SET default_tablespace = '';
SET default_with_oids = false;
--
--- Name: config; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: config; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE config (
+CREATE TABLE public.config (
id integer NOT NULL,
publicvhost character varying,
shortname character varying,
@@ -55,13 +59,13 @@ CREATE TABLE config (
);
-ALTER TABLE config OWNER TO nms;
+ALTER TABLE public.config OWNER TO nms;
--
-- Name: config_id_seq; Type: SEQUENCE; Schema: public; Owner: nms
--
-CREATE SEQUENCE config_id_seq
+CREATE SEQUENCE public.config_id_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
@@ -69,21 +73,21 @@ CREATE SEQUENCE config_id_seq
CACHE 1;
-ALTER TABLE config_id_seq OWNER TO nms;
+ALTER TABLE public.config_id_seq OWNER TO nms;
--
-- Name: config_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: nms
--
-ALTER SEQUENCE config_id_seq OWNED BY config.id;
+ALTER SEQUENCE public.config_id_seq OWNED BY public.config.id;
--
--- Name: dhcp; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: dhcp; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE dhcp (
- switch integer,
+CREATE TABLE public.dhcp (
+ network integer,
"time" timestamp with time zone,
mac macaddr,
ip inet,
@@ -91,13 +95,13 @@ CREATE TABLE dhcp (
);
-ALTER TABLE dhcp OWNER TO nms;
+ALTER TABLE public.dhcp OWNER TO nms;
--
--- Name: linknet_ping; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: linknet_ping; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE linknet_ping (
+CREATE TABLE public.linknet_ping (
linknet integer NOT NULL,
"time" timestamp with time zone DEFAULT now() NOT NULL,
latency1_ms double precision,
@@ -105,13 +109,13 @@ CREATE TABLE linknet_ping (
);
-ALTER TABLE linknet_ping OWNER TO nms;
+ALTER TABLE public.linknet_ping OWNER TO nms;
--
--- Name: linknets; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: linknets; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE linknets (
+CREATE TABLE public.linknets (
linknet integer NOT NULL,
switch1 integer NOT NULL,
addr1 inet,
@@ -122,13 +126,13 @@ CREATE TABLE linknets (
);
-ALTER TABLE linknets OWNER TO nms;
+ALTER TABLE public.linknets OWNER TO nms;
--
-- Name: linknets_linknet_seq; Type: SEQUENCE; Schema: public; Owner: nms
--
-CREATE SEQUENCE linknets_linknet_seq
+CREATE SEQUENCE public.linknets_linknet_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
@@ -136,20 +140,74 @@ CREATE SEQUENCE linknets_linknet_seq
CACHE 1;
-ALTER TABLE linknets_linknet_seq OWNER TO nms;
+ALTER TABLE public.linknets_linknet_seq OWNER TO nms;
--
-- Name: linknets_linknet_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: nms
--
-ALTER SEQUENCE linknets_linknet_seq OWNED BY linknets.linknet;
+ALTER SEQUENCE public.linknets_linknet_seq OWNED BY public.linknets.linknet;
+
+
+--
+-- Name: networks; Type: TABLE; Schema: public; Owner: nms
+--
+
+CREATE TABLE public.networks (
+ name character varying NOT NULL,
+ subnet4 cidr,
+ subnet6 cidr,
+ gw4 inet,
+ gw6 inet,
+ vlan integer,
+ tags jsonb DEFAULT '[]'::jsonb,
+ network integer NOT NULL,
+ router integer
+);
+
+
+ALTER TABLE public.networks OWNER TO nms;
+
+--
+-- Name: networks_network_seq; Type: SEQUENCE; Schema: public; Owner: nms
+--
+
+CREATE SEQUENCE public.networks_network_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+ALTER TABLE public.networks_network_seq OWNER TO nms;
--
--- Name: oplog; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: networks_networks_seq; Type: SEQUENCE; Schema: public; Owner: nms
--
-CREATE TABLE oplog (
+CREATE SEQUENCE public.networks_networks_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+ALTER TABLE public.networks_networks_seq OWNER TO nms;
+
+--
+-- Name: networks_networks_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: nms
+--
+
+ALTER SEQUENCE public.networks_networks_seq OWNED BY public.networks.network;
+
+
+--
+-- Name: oplog; Type: TABLE; Schema: public; Owner: nms
+--
+
+CREATE TABLE public.oplog (
id integer NOT NULL,
"time" timestamp with time zone DEFAULT now(),
systems character varying,
@@ -158,13 +216,13 @@ CREATE TABLE oplog (
);
-ALTER TABLE oplog OWNER TO nms;
+ALTER TABLE public.oplog OWNER TO nms;
--
-- Name: oplog_id_seq; Type: SEQUENCE; Schema: public; Owner: nms
--
-CREATE SEQUENCE oplog_id_seq
+CREATE SEQUENCE public.oplog_id_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
@@ -172,73 +230,73 @@ CREATE SEQUENCE oplog_id_seq
CACHE 1;
-ALTER TABLE oplog_id_seq OWNER TO nms;
+ALTER TABLE public.oplog_id_seq OWNER TO nms;
--
-- Name: oplog_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: nms
--
-ALTER SEQUENCE oplog_id_seq OWNED BY oplog.id;
+ALTER SEQUENCE public.oplog_id_seq OWNED BY public.oplog.id;
--
--- Name: ping; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: ping; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE ping (
+CREATE TABLE public.ping (
switch integer NOT NULL,
"time" timestamp with time zone DEFAULT now() NOT NULL,
latency_ms double precision
);
-ALTER TABLE ping OWNER TO nms;
+ALTER TABLE public.ping OWNER TO nms;
--
--- Name: ping_secondary_ip; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: ping_secondary_ip; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE ping_secondary_ip (
+CREATE TABLE public.ping_secondary_ip (
switch integer NOT NULL,
"time" timestamp with time zone DEFAULT now() NOT NULL,
latency_ms double precision
);
-ALTER TABLE ping_secondary_ip OWNER TO nms;
+ALTER TABLE public.ping_secondary_ip OWNER TO nms;
--
--- Name: seen_mac; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: seen_mac; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE seen_mac (
+CREATE TABLE public.seen_mac (
mac macaddr NOT NULL,
address inet NOT NULL,
seen timestamp with time zone DEFAULT now() NOT NULL
);
-ALTER TABLE seen_mac OWNER TO nms;
+ALTER TABLE public.seen_mac OWNER TO nms;
--
--- Name: snmp; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: snmp; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE snmp (
- "time" timestamp without time zone DEFAULT now() NOT NULL,
+CREATE TABLE public.snmp (
+ "time" timestamp with time zone DEFAULT now() NOT NULL,
switch integer NOT NULL,
data jsonb,
id integer NOT NULL
);
-ALTER TABLE snmp OWNER TO nms;
+ALTER TABLE public.snmp OWNER TO nms;
--
-- Name: snmp_id_seq; Type: SEQUENCE; Schema: public; Owner: nms
--
-CREATE SEQUENCE snmp_id_seq
+CREATE SEQUENCE public.snmp_id_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
@@ -246,48 +304,45 @@ CREATE SEQUENCE snmp_id_seq
CACHE 1;
-ALTER TABLE snmp_id_seq OWNER TO nms;
+ALTER TABLE public.snmp_id_seq OWNER TO nms;
--
-- Name: snmp_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: nms
--
-ALTER SEQUENCE snmp_id_seq OWNED BY snmp.id;
+ALTER SEQUENCE public.snmp_id_seq OWNED BY public.snmp.id;
--
--- Name: switches; Type: TABLE; Schema: public; Owner: nms; Tablespace:
+-- Name: switches; Type: TABLE; Schema: public; Owner: nms
--
-CREATE TABLE switches (
+CREATE TABLE public.switches (
switch integer DEFAULT nextval(('"switches_switch_seq"'::text)::regclass) NOT NULL,
mgmt_v4_addr inet,
sysname character varying NOT NULL,
last_updated timestamp with time zone,
locked boolean DEFAULT false NOT NULL,
poll_frequency interval DEFAULT '00:01:00'::interval NOT NULL,
- community character varying DEFAULT 'FullPuppTilNMS'::character varying NOT NULL,
+ community character varying DEFAULT 'IskremTilMiddag'::character varying NOT NULL,
mgmt_v6_addr inet,
placement box,
- subnet4 cidr,
- subnet6 cidr,
distro_name character varying,
distro_phy_port character varying(100),
- mgmt_v6_gw inet,
- mgmt_v4_gw inet,
- mgmt_vlan integer DEFAULT 666,
- traffic_vlan integer,
- tags jsonb DEFAULT '[]'::jsonb
+ tags jsonb DEFAULT '[]'::jsonb,
+ deleted boolean DEFAULT false,
+ mgmt_vlan character varying,
+ traffic_vlan character varying
);
-ALTER TABLE switches OWNER TO nms;
+ALTER TABLE public.switches OWNER TO nms;
--
-- Name: switches_switch_seq; Type: SEQUENCE; Schema: public; Owner: nms
--
-CREATE SEQUENCE switches_switch_seq
+CREATE SEQUENCE public.switches_switch_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
@@ -295,290 +350,280 @@ CREATE SEQUENCE switches_switch_seq
CACHE 1;
-ALTER TABLE switches_switch_seq OWNER TO nms;
+ALTER TABLE public.switches_switch_seq OWNER TO nms;
+
+--
+-- Name: config id; Type: DEFAULT; Schema: public; Owner: nms
+--
+
+ALTER TABLE ONLY public.config ALTER COLUMN id SET DEFAULT nextval('public.config_id_seq'::regclass);
+
--
--- Name: id; Type: DEFAULT; Schema: public; Owner: nms
+-- Name: linknets linknet; Type: DEFAULT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY config ALTER COLUMN id SET DEFAULT nextval('config_id_seq'::regclass);
+ALTER TABLE ONLY public.linknets ALTER COLUMN linknet SET DEFAULT nextval('public.linknets_linknet_seq'::regclass);
--
--- Name: linknet; Type: DEFAULT; Schema: public; Owner: nms
+-- Name: networks network; Type: DEFAULT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY linknets ALTER COLUMN linknet SET DEFAULT nextval('linknets_linknet_seq'::regclass);
+ALTER TABLE ONLY public.networks ALTER COLUMN network SET DEFAULT nextval('public.networks_networks_seq'::regclass);
--
--- Name: id; Type: DEFAULT; Schema: public; Owner: nms
+-- Name: oplog id; Type: DEFAULT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY oplog ALTER COLUMN id SET DEFAULT nextval('oplog_id_seq'::regclass);
+ALTER TABLE ONLY public.oplog ALTER COLUMN id SET DEFAULT nextval('public.oplog_id_seq'::regclass);
--
--- Name: id; Type: DEFAULT; Schema: public; Owner: nms
+-- Name: snmp id; Type: DEFAULT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY snmp ALTER COLUMN id SET DEFAULT nextval('snmp_id_seq'::regclass);
+ALTER TABLE ONLY public.snmp ALTER COLUMN id SET DEFAULT nextval('public.snmp_id_seq'::regclass);
--
--- Name: seen_mac_pkey; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace:
+-- Name: seen_mac seen_mac_pkey; Type: CONSTRAINT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY seen_mac
+ALTER TABLE ONLY public.seen_mac
ADD CONSTRAINT seen_mac_pkey PRIMARY KEY (mac, address, seen);
--
--- Name: switches_pkey; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace:
+-- Name: switches switches_pkey; Type: CONSTRAINT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY switches
+ALTER TABLE ONLY public.switches
ADD CONSTRAINT switches_pkey PRIMARY KEY (switch);
--
--- Name: switches_sysname_key; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace:
+-- Name: switches switches_sysname_key; Type: CONSTRAINT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY switches
+ALTER TABLE ONLY public.switches
ADD CONSTRAINT switches_sysname_key UNIQUE (sysname);
--
--- Name: switches_sysname_key1; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace:
+-- Name: switches switches_sysname_key1; Type: CONSTRAINT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY switches
+ALTER TABLE ONLY public.switches
ADD CONSTRAINT switches_sysname_key1 UNIQUE (sysname);
--
--- Name: dhcp_ip; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: dhcp_ip; Type: INDEX; Schema: public; Owner: nms
+--
+
+CREATE INDEX dhcp_ip ON public.dhcp USING btree (ip);
+
+
+--
+-- Name: dhcp_mac; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX dhcp_ip ON dhcp USING btree (ip);
+CREATE INDEX dhcp_mac ON public.dhcp USING btree (mac);
--
--- Name: dhcp_mac; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: dhcp_network; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX dhcp_mac ON dhcp USING btree (mac);
+CREATE INDEX dhcp_network ON public.dhcp USING btree (network);
--
--- Name: dhcp_switch; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: dhcp_time; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX dhcp_switch ON dhcp USING btree (switch);
+CREATE INDEX dhcp_time ON public.dhcp USING btree ("time");
--
--- Name: dhcp_time; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: ping_index; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX dhcp_time ON dhcp USING btree ("time");
+CREATE INDEX ping_index ON public.ping USING btree ("time");
--
--- Name: ping_index; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: ping_secondary_index; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX ping_index ON ping USING btree ("time");
+CREATE INDEX ping_secondary_index ON public.ping_secondary_ip USING btree ("time");
--
--- Name: ping_secondary_index; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: seen_mac_addr_family; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX ping_secondary_index ON ping_secondary_ip USING btree ("time");
+CREATE INDEX seen_mac_addr_family ON public.seen_mac USING btree (family(address));
--
--- Name: seen_mac_addr_family; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: seen_mac_seen; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX seen_mac_addr_family ON seen_mac USING btree (family(address));
+CREATE INDEX seen_mac_seen ON public.seen_mac USING btree (seen);
--
--- Name: seen_mac_seen; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: snmp_time; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX seen_mac_seen ON seen_mac USING btree (seen);
+CREATE INDEX snmp_time ON public.snmp USING btree ("time");
--
--- Name: snmp_time; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: snmp_time15; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX snmp_time ON snmp USING btree ("time");
+CREATE INDEX snmp_time15 ON public.snmp USING btree (id, switch);
--
--- Name: snmp_time15; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: snmp_time6; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX snmp_time15 ON snmp USING btree (id, switch);
+CREATE INDEX snmp_time6 ON public.snmp USING btree ("time" DESC, switch);
--
--- Name: snmp_time6; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: switches_switch; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX snmp_time6 ON snmp USING btree ("time" DESC, switch);
+CREATE INDEX switches_switch ON public.switches USING hash (switch);
--
--- Name: switches_switch; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: updated_index2; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX switches_switch ON switches USING hash (switch);
+CREATE INDEX updated_index2 ON public.linknet_ping USING btree ("time");
--
--- Name: updated_index2; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: updated_index3; Type: INDEX; Schema: public; Owner: nms
--
-CREATE INDEX updated_index2 ON linknet_ping USING btree ("time");
+CREATE INDEX updated_index3 ON public.ping_secondary_ip USING btree ("time");
--
--- Name: updated_index3; Type: INDEX; Schema: public; Owner: nms; Tablespace:
+-- Name: networks networks_router_fkey; Type: FK CONSTRAINT; Schema: public; Owner: nms
--
-CREATE INDEX updated_index3 ON ping_secondary_ip USING btree ("time");
+ALTER TABLE ONLY public.networks
+ ADD CONSTRAINT networks_router_fkey FOREIGN KEY (router) REFERENCES public.switches(switch);
--
--- Name: dhcp_switch_fkey; Type: FK CONSTRAINT; Schema: public; Owner: nms
+-- Name: snmp snmp_switch_fkey; Type: FK CONSTRAINT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY dhcp
- ADD CONSTRAINT dhcp_switch_fkey FOREIGN KEY (switch) REFERENCES switches(switch);
+ALTER TABLE ONLY public.snmp
+ ADD CONSTRAINT snmp_switch_fkey FOREIGN KEY (switch) REFERENCES public.switches(switch);
--
--- Name: snmp_switch_fkey; Type: FK CONSTRAINT; Schema: public; Owner: nms
+-- Name: ping switchname; Type: FK CONSTRAINT; Schema: public; Owner: nms
--
-ALTER TABLE ONLY snmp
- ADD CONSTRAINT snmp_switch_fkey FOREIGN KEY (switch) REFERENCES switches(switch);
+ALTER TABLE ONLY public.ping
+ ADD CONSTRAINT switchname FOREIGN KEY (switch) REFERENCES public.switches(switch);
--
--- Name: switchname; Type: FK CONSTRAINT; Schema: public; Owner: nms
+-- Name: TABLE config; Type: ACL; Schema: public; Owner: nms
--
-ALTER TABLE ONLY ping
- ADD CONSTRAINT switchname FOREIGN KEY (switch) REFERENCES switches(switch);
+GRANT ALL ON TABLE public.config TO dhcptail;
--
--- Name: public; Type: ACL; Schema: -; Owner: postgres
+-- Name: TABLE dhcp; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
-GRANT ALL ON SCHEMA public TO PUBLIC;
+GRANT ALL ON TABLE public.dhcp TO dhcptail;
--
--- Name: config; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE linknet_ping; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE config FROM PUBLIC;
-REVOKE ALL ON TABLE config FROM nms;
-GRANT ALL ON TABLE config TO nms;
+GRANT ALL ON TABLE public.linknet_ping TO dhcptail;
--
--- Name: dhcp; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE linknets; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE dhcp FROM PUBLIC;
-REVOKE ALL ON TABLE dhcp FROM nms;
-GRANT ALL ON TABLE dhcp TO nms;
+GRANT ALL ON TABLE public.linknets TO dhcptail;
--
--- Name: linknet_ping; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE networks; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE linknet_ping FROM PUBLIC;
-REVOKE ALL ON TABLE linknet_ping FROM nms;
-GRANT ALL ON TABLE linknet_ping TO nms;
+GRANT ALL ON TABLE public.networks TO dhcptail;
--
--- Name: linknets; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE oplog; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE linknets FROM PUBLIC;
-REVOKE ALL ON TABLE linknets FROM nms;
-GRANT ALL ON TABLE linknets TO nms;
+GRANT ALL ON TABLE public.oplog TO dhcptail;
--
--- Name: ping; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE ping; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE ping FROM PUBLIC;
-REVOKE ALL ON TABLE ping FROM nms;
-GRANT ALL ON TABLE ping TO nms;
+GRANT ALL ON TABLE public.ping TO dhcptail;
--
--- Name: ping_secondary_ip; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE ping_secondary_ip; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE ping_secondary_ip FROM PUBLIC;
-REVOKE ALL ON TABLE ping_secondary_ip FROM nms;
-GRANT ALL ON TABLE ping_secondary_ip TO nms;
+GRANT ALL ON TABLE public.ping_secondary_ip TO dhcptail;
--
--- Name: seen_mac; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE seen_mac; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE seen_mac FROM PUBLIC;
-REVOKE ALL ON TABLE seen_mac FROM nms;
-GRANT ALL ON TABLE seen_mac TO nms;
+GRANT ALL ON TABLE public.seen_mac TO dhcptail;
--
--- Name: snmp; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE snmp; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE snmp FROM PUBLIC;
-REVOKE ALL ON TABLE snmp FROM nms;
-GRANT ALL ON TABLE snmp TO nms;
-GRANT ALL ON TABLE snmp TO postgres;
+GRANT ALL ON TABLE public.snmp TO postgres;
+GRANT ALL ON TABLE public.snmp TO dhcptail;
--
--- Name: snmp_id_seq; Type: ACL; Schema: public; Owner: nms
+-- Name: SEQUENCE snmp_id_seq; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON SEQUENCE snmp_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE snmp_id_seq FROM nms;
-GRANT ALL ON SEQUENCE snmp_id_seq TO nms;
-GRANT ALL ON SEQUENCE snmp_id_seq TO postgres;
+GRANT ALL ON SEQUENCE public.snmp_id_seq TO postgres;
--
--- Name: switches; Type: ACL; Schema: public; Owner: nms
+-- Name: TABLE switches; Type: ACL; Schema: public; Owner: nms
--
-REVOKE ALL ON TABLE switches FROM PUBLIC;
-REVOKE ALL ON TABLE switches FROM nms;
-GRANT ALL ON TABLE switches TO nms;
+GRANT ALL ON TABLE public.switches TO dhcptail;
--
diff --git a/web/api/public/distro-tree b/web/api/public/distro-tree
index cff35ec..49ce607 100755
--- a/web/api/public/distro-tree
+++ b/web/api/public/distro-tree
@@ -10,16 +10,18 @@ use strict;
use warnings;
use Data::Dumper;
-$nms::web::cc{'max-age'} = "20";
+$nms::web::cc{'max-age'} = "5";
+$nms::web::cc{'stale-while-revalidate'} = "30";
my $q2 = $nms::web::dbh->prepare('select sysname,distro_phy_port,distro_name from switches where placement is not null and distro_name is not null and distro_phy_port is not null and deleted = false');
$q2->execute();
while (my $ref = $q2->fetchrow_hashref()) {
my $sysname = $ref->{'sysname'};
- my $phy = $ref->{'distro_phy_port'};
my $distro = $ref->{'distro_name'};
- $nms::web::json{'distro-tree'}{$distro}{$phy} = $sysname;
+ my $phy = $ref->{'distro_phy_port'};
+ $nms::web::json{'distro-tree-phy'}{$distro}{$phy} = $sysname;
+ $nms::web::json{'distro-tree-sys'}{$distro}{$sysname} = $phy;
}
finalize_output();
diff --git a/web/api/public/switches b/web/api/public/switches
index 8e7f333..9bb63d8 100755
--- a/web/api/public/switches
+++ b/web/api/public/switches
@@ -29,11 +29,4 @@ while (my $ref = $q2->fetchrow_hashref()) {
$nms::web::json{'switches'}{$ref->{'sysname'}}{'tags'} = $data;
}
-my $q4 = $nms::web::dbh->prepare('select linknet, (select sysname from switches where switch = switch1) as sysname1, (select sysname from switches where switch = switch2) as sysname2 from linknets');
-
-$q4->execute();
-while (my $ref = $q4->fetchrow_hashref()) {
- $nms::web::json{'linknets'}{$ref->{'linknet'}} = $ref;
-}
-
finalize_output();
diff --git a/web/api/read/distro-management b/web/api/read/distro-management
deleted file mode 100755
index 55ca07e..0000000
--- a/web/api/read/distro-management
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/perl
-# vim:ts=8:sw=8
-
-use CGI qw(fatalsToBrowser);
-use DBI;
-use lib '/opt/gondul/include';
-use nms;
-use nms::web;
-use strict;
-use warnings;
-use Data::Dumper;
-
-my $target = $ENV{REQUEST_URI};
-$target =~ s/$ENV{SCRIPT_NAME}//;
-$target =~ s/^\///;
-my ($switch, $port) = split(/\//,$target,2);
-my $q2;
-
-$nms::web::cc{'max-age'} = "5";
-$nms::web::cc{'stale-while-revalidate'} = "30";
-
-$q2 = $nms::web::dbh->prepare('SELECT distro_name,sysname,distro_phy_port FROM switches WHERE placement is not null AND distro_name is not null AND distro_phy_port is not null and deleted = false');
-
-$q2->execute();
-while (my $ref = $q2->fetchrow_hashref()) {
- my $sysname = $ref->{'sysname'};
- my $distro = $ref->{'distro_name'};
- $nms::web::json{'distros'}{$distro}{$sysname} = $ref;
-}
-
-finalize_output();
diff --git a/web/api/read/networks b/web/api/read/networks
index 870ae8c..0fbdb15 100755
--- a/web/api/read/networks
+++ b/web/api/read/networks
@@ -13,23 +13,12 @@ use Data::Dumper;
$nms::web::cc{'max-age'} = "5";
$nms::web::cc{'stale-while-revalidate'} = "30";
-my $q2 = $nms::web::dbh->prepare('select network, name, vlan, tags, routing_point, placement, last_updated, subnet4, subnet6, gw4, gw6 from networks');
+my $q2 = $nms::web::dbh->prepare('select name, vlan, networks.tags, switches.sysname as router, subnet4, subnet6, gw4, gw6 from networks left join switches on switches.switch = networks.router');
$q2->execute();
while (my $ref = $q2->fetchrow_hashref()) {
- $ref->{'placement'} =~ /\((-?\d+),(-?\d+)\),\((-?\d+),(-?\d+)\)/;
- my ($x1, $y1, $x2, $y2) = ($1, $2, $3, $4);
my $name = $ref->{'name'};
- $nms::web::json{'networks'}{$ref->{'name'}}{'vlan'} = $ref->{'vlan'};
- $nms::web::json{'networks'}{$ref->{'name'}}{'subnet4'} = $ref->{'subnet4'};
- $nms::web::json{'networks'}{$ref->{'name'}}{'subnet6'} = $ref->{'subnet6'};
- $nms::web::json{'networks'}{$ref->{'name'}}{'gw4'} = $ref->{'gw4'};
- $nms::web::json{'networks'}{$ref->{'name'}}{'gw6'} = $ref->{'gw6'};
- $nms::web::json{'networks'}{$ref->{'name'}}{'placement'}{'x'} = $x2;
- $nms::web::json{'networks'}{$ref->{'name'}}{'placement'}{'y'} = $y2;
- $nms::web::json{'networks'}{$ref->{'name'}}{'placement'}{'width'} = $x1 - $x2;
- $nms::web::json{'networks'}{$ref->{'name'}}{'placement'}{'height'} = $y1 - $y2;
- $nms::web::json{'networks'}{$ref->{'name'}}{'routing_point'} = $ref->{'routing_point'};
+ $nms::web::json{'networks'}{$ref->{'name'}} = $ref;
my $data = JSON::XS::decode_json($ref->{'tags'});
$nms::web::json{'networks'}{$ref->{'name'}}{'tags'} = $data;
}
diff --git a/web/api/read/oplog b/web/api/read/oplog
index fb187ea..f2ed3a7 100755
--- a/web/api/read/oplog
+++ b/web/api/read/oplog
@@ -6,7 +6,14 @@ use nms::web;
use strict;
use warnings;
-my $query = $nms::web::dbh->prepare('select id,date_trunc(\'second\',time) as timestamp,extract(hour from time) as h, extract(minute from time) as m,systems,username,log from oplog order by id desc;');
+my $filter = '';
+
+if (defined($get_params{'now'})) {
+ $filter = "where time < timestamp with time zone 'epoch' + " . db_safe_quote('now') . " * INTERVAL '1 second' ";
+}
+my $query = $nms::web::dbh->prepare('select id,date_trunc(\'second\',time) as timestamp,extract(hour from time) as h, extract(minute from time) as m,systems,username,log from oplog '
+ . $filter .
+'order by id desc;');
$query->execute();
while (my $ref = $query->fetchrow_hashref()) {
my %meh;
diff --git a/web/api/read/switches-management b/web/api/read/switches-management
index b42c84b..118ea4d 100755
--- a/web/api/read/switches-management
+++ b/web/api/read/switches-management
@@ -25,23 +25,28 @@ my $q2;
$nms::web::cc{'max-age'} = "5";
$nms::web::cc{'stale-while-revalidate'} = "30";
-if (!defined($switch)) {
- $q2 = $nms::web::dbh->prepare('select switches.sysname, host(switches.mgmt_v4_addr) as mgmt_v4_addr, host(switches.mgmt_v6_addr) as mgmt_v6_addr, switches.mgmt_vlan, switches.traffic_vlan, switches.poll_frequency, switches.last_updated, switches.distro_name, switches.distro_phy_port, switches.community, traffic_net.subnet4, traffic_net.subnet6, host(mgmt_net.gw4) as mgmt_v4_gw, host(mgmt_net.gw6) as mgmt_v6_gw from switches left join networks as traffic_net on (switches.traffic_vlan = traffic_net.name) left join networks as mgmt_net on (switches.mgmt_vlan = mgmt_net.name) where switches.placement is not null and switches.deleted = false;');
-} else {
- $q2 = $nms::web::dbh->prepare('select sysname,host(mgmt_v4_addr) as mgmt_v4_addr,host(mgmt_v6_addr) as mgmt_v6_addr,mgmt_vlan,traffic_vlan,poll_frequency,last_updated,distro_name,distro_phy_port,community from switches where placement is not null and sysname = ' . $nms::web::dbh->quote($switch) . ' and switches.deleted = false;');
+my $limit = '';
+if (defined($switch)) {
+ $limit = ' and sysname = ' . $nms::web::dbh->quote($switch);
}
+$q2 = $nms::web::dbh->prepare("select
+ switches.sysname,
+ host(switches.mgmt_v4_addr) as mgmt_v4_addr,
+ host(switches.mgmt_v6_addr) as mgmt_v6_addr,
+ switches.mgmt_vlan,
+ switches.traffic_vlan,
+ switches.poll_frequency,
+ switches.last_updated,
+ switches.distro_name,
+ switches.distro_phy_port,
+ switches.community
+ from switches where switches.placement is not null and switches.deleted = false $limit;");
+
$q2->execute();
while (my $ref = $q2->fetchrow_hashref()) {
my $sysname = $ref->{'sysname'};
$nms::web::json{'switches'}{$ref->{'sysname'}} = $ref;
}
-my $q4 = $nms::web::dbh->prepare('select linknet, (select sysname from switches where switch = switch1) as sysname1, addr1, (select sysname from switches where switch = switch2) as sysname2,addr2 from linknets');
-
-$q4->execute();
-while (my $ref = $q4->fetchrow_hashref()) {
- $nms::web::json{'linknets'}{$ref->{'linknet'}} = $ref;
-}
-
finalize_output();
diff --git a/web/api/read/template-list b/web/api/read/template-list
index d1c8773..81b9986 100755
--- a/web/api/read/template-list
+++ b/web/api/read/template-list
@@ -6,10 +6,10 @@ use nms::web;
use strict;
use warnings;
-my $template_dir = "/opt/gondul/web/templates";
-
-opendir (DIR, $template_dir) or die $!;
+my @dirs = ("/opt/gondul/web/templates","/opt/gondul/data/templates");
+foreach my $template_dir (@dirs) {
+opendir (DIR, $template_dir) or next;
while (my $file = readdir(DIR)) {
next if ($file =~ m/^\./);
my %meh;
@@ -17,5 +17,5 @@ while (my $file = readdir(DIR)) {
push @{$nms::web::json{'templates'}},\%meh;
}
-
+}
nms::web::finalize_output();
diff --git a/web/api/write/linknet-add b/web/api/write/linknet-add
deleted file mode 100755
index 13ccd17..0000000
--- a/web/api/write/linknet-add
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/perl
-# vim:ts=8:sw=8
-use lib '/opt/gondul/include';
-use utf8;
-use nms::web qw($dbh db_safe_quote get_input finalize_output);
-use strict;
-use warnings;
-
-my $in = get_input();
-my %tmp = %{JSON::XS::decode_json($in)};
-
-my $q = $nms::web::dbh->prepare("INSERT INTO linknets (switch1, switch2) VALUES((SELECT switch FROM switches WHERE sysname = ? LIMIT 1), (SELECT switch FROM switches WHERE sysname = ? LIMIT 1));");
-my $sth = $nms::web::dbh->prepare("SELECT linknet FROM linknets WHERE switch1 = (SELECT switch FROM switches WHERE sysname = ? LIMIT 1) and switch2 = (SELECT switch FROM switches WHERE sysname = ? LIMIT 1);");
-
-$sth->execute($tmp{'switch1'}, $tmp{'switch2'});
-my $affected = 0;
-while ( my @row = $sth->fetchrow_array ) {
- $affected += 1;
-}
-
-print "X-affected: $affected\n";
-if ($affected eq 0) {
- $q->execute($tmp{'switch1'}, $tmp{'switch2'});
-}
-
-$dbh->commit;
-$nms::web::cc{'max-age'} = '0';
-$nms::web::cc{'stale-while-revalidate'} = '0';
-$nms::web::json{'state'} = 'ok';
-
-print "X-ban: /api/public/.*\n";
-finalize_output();
diff --git a/web/api/write/network-add b/web/api/write/network-add
deleted file mode 100755
index d1aab4e..0000000
--- a/web/api/write/network-add
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /usr/bin/perl
-# vim:ts=8:sw=8
-
-#use CGI qw(fatalsToBrowser);
-use DBI;
-use lib '/opt/gondul/include';
-use nms;
-use nms::web qw(%get_params %json finalize_output get_input $dbh);
-use nms::util qw(guess_placement);
-use strict;
-use warnings;
-use JSON;
-use Data::Dumper;
-use nms::oplog qw(oplog);
-
-$nms::web::cc{'max-age'} = "0";
-
-my $in = get_input();
-my @tmp = @{JSON::XS::decode_json($in)};
-
-my @added;
-my @dups;
-
-my $sth = $nms::web::dbh->prepare("SELECT name FROM networks WHERE name=?");
-
-foreach my $tmp2 (@tmp) {
- my %network = %{$tmp2};
- my $affected = 0;
- my %template = ();
- if (not defined($network{'name'})) {
- next;
- }
-
- $sth->execute( $network{'name'});
- while ( my @row = $sth->fetchrow_array ) {
- $affected += 1;
- }
-
- if ($affected == 0) {
- $nms::web::dbh->do("INSERT INTO NETWORKS (name) VALUES ('$network{'name'}');");
- push @added, $network{'name'};
- oplog("\"" . $network{'name'} . "\"", "Network added: " . $network{'name'});
- }
-}
-
-$json{'networks_addded'} = \@added;
-
-print "X-ban: /api/.*\n";
-finalize_output();
diff --git a/web/api/write/network-update b/web/api/write/networks
index 6344c37..460a7ae 100755
--- a/web/api/write/network-update
+++ b/web/api/write/networks
@@ -6,7 +6,6 @@ use DBI;
use lib '/opt/gondul/include';
use nms;
use nms::web qw(%get_params %json finalize_output get_input $dbh);
-use nms::util qw(guess_placement);
use strict;
use warnings;
use JSON;
@@ -23,7 +22,7 @@ my @dups;
my $sth = $nms::web::dbh->prepare("SELECT name FROM networks WHERE name=?");
-my @fields = ('name','last_updated','subnet4','subnet6','gw4','gw6','routing_point','vlan','tags');
+my @fields = ('name','subnet4','subnet6','gw4','gw6','router','vlan','tags');
foreach my $tmp2 (@tmp) {
my %network = %{$tmp2};
@@ -47,8 +46,16 @@ foreach my $tmp2 (@tmp) {
}
} keys %network;
-
- $nms::web::dbh->do("INSERT INTO NETWORKS (name, last_updated, subnet4, subnet6, routing_point, gw4, gw6, vlan, tags) VALUES ($template{'name'}, $template{'last_updated'}, $template{'subnet4'}, $template{'subnet6'}, $template{'routing_point'}, $template{'gw4'}, $template{'gw6'}, $template{'vlan'}, $template{'tags'});");
+ if ($template{'router'} ne 'DEFAULT') {
+ $template{'router'} = "(select switch from switches where sysname = $template{'router'})";
+ }
+ if ($template{'gw4'} eq 'DEFAULT' and $template{'subnet4'} ne 'DEFAULT') {
+ $template{'gw4'} = "host(inet $template{'subnet4'} + 1)";
+ }
+ if ($template{'gw6'} eq 'DEFAULT' and $template{'subnet6'} ne 'DEFAULT') {
+ $template{'gw6'} = "host(inet $template{'subnet6'} + 1)";
+ }
+ $nms::web::dbh->do("INSERT INTO NETWORKS (name, subnet4, subnet6, router, gw4, gw6, vlan, tags) VALUES ($template{'name'}, $template{'subnet4'}, $template{'subnet6'}, $template{'router'}, $template{'gw4'}, $template{'gw6'}, $template{'vlan'}, $template{'tags'});");
push @added, $network{'name'};
} else {
if (defined($network{'tags'})) {
@@ -57,7 +64,11 @@ foreach my $tmp2 (@tmp) {
my @set;
map {
if (defined($template{$_})) {
- push @set, "$_=" . $dbh->quote($network{$_});
+ if ($_ eq "router") {
+ push @set, "router=(select switch from switches where sysname = " . $dbh->quote($network{$_}) . ")";
+ } else {
+ push @set, "$_=" . $dbh->quote($network{$_});
+ }
}
} keys %network;
$nms::web::dbh->do("UPDATE networks SET " . join(", ", @set) . "WHERE name=" . $dbh->quote($network{'name'}) . ";");
diff --git a/web/api/write/switch-add b/web/api/write/switch-add
deleted file mode 100755
index c92cf31..0000000
--- a/web/api/write/switch-add
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /usr/bin/perl
-# vim:ts=8:sw=8
-
-#use CGI qw(fatalsToBrowser);
-use DBI;
-use lib '/opt/gondul/include';
-use nms;
-use nms::web qw(%get_params %json finalize_output get_input $dbh);
-use nms::util qw(guess_placement);
-use strict;
-use warnings;
-use JSON;
-use Data::Dumper;
-use nms::oplog qw(oplog);
-
-$nms::web::cc{'max-age'} = "0";
-
-my $in = get_input();
-my @tmp = @{JSON::XS::decode_json($in)};
-
-my @added;
-my @dups;
-
-my $sth = $nms::web::dbh->prepare("SELECT sysname FROM switches WHERE sysname=?");
-
-my @fields = ( 'community', 'distro_name', 'distro_phy_port', 'mgmt_v4_addr', 'mgmt_v6_addr', 'mgmt_vlan', 'placement', 'poll_frequency', 'sysname', 'traffic_vlan');
-
-sub convertplace
-{
- my %in = %{$_[0]};
- my %out = ();
-
- if (not defined $in{'x1'} and defined($in{'x'})) {
- $out{'x1'} = int($in{'x'});
- $out{'y1'} = int($in{'y'});
- $out{'xx'} = int($in{'x'} + $in{'width'});
- $out{'yy'} = int($in{'y'} + $in{'height'});
- } else {
- return \%in;
- }
- return \%out;
-}
-
-foreach my $tmp2 (@tmp) {
- my %switch = %{$tmp2};
- my $affected = 0;
- my %template = ();
- map { $template{$_} = 'DEFAULT' } @fields;
- if (not defined($switch{'sysname'})) {
- next;
- }
-
- $sth->execute( $switch{'sysname'});
- while ( my @row = $sth->fetchrow_array ) {
- $affected += 1;
- }
-
- if ($affected == 0) {
- my %placement;
- if (not defined ($switch{'placement'})) {
- %placement = guess_placement($switch{'sysname'});
- } else {
- %placement = %{convertplace($switch{'placement'})};
- }
- if (not defined($switch{'ip'}) and defined($switch{'mgtmt4'})) {
- $switch{'ip'} = $switch{'mgtmt4'};
- }
- if (not defined($switch{'secondary_ip'}) and defined($switch{'mgtmt6'})) {
- $switch{'secondary_ip'} = $switch{'mgtmt6'};
- }
- my ($x1,$x2,$y1,$y2);
- $x1 = $placement{'x1'};
- $y1 = $placement{'y1'};
- $x2 = $placement{'xx'};
- $y2 = $placement{'yy'};
- $switch{'placement'} = "(($x1,$y1),($x2,$y2))";
-
- map {
- if (defined ($template{$_})) {
- $template{$_} = $dbh->quote($switch{$_});
- }
- } keys %switch;
-
-
- $nms::web::dbh->do("INSERT INTO SWITCHES (mgmt_v4_addr, sysname, poll_frequency, community, mgmt_v6_addr, placement, distro_name) VALUES ($template{'mgmt_v4_addr'}, $template{'sysname'}, $template{'poll_frequency'}, $template{'community'}, $template{'mgmt_v6_addr'}, $template{'placement'}, $template{'distro_name'});");
- push @added, $switch{'sysname'};
- oplog("\"" . $switch{'sysname'} . "\"", "Switch added: " . $switch{'sysname'});
- }
-}
-
-$json{'switches_addded'} = \@added;
-
-print "X-ban: /api/.*\n";
-finalize_output();
diff --git a/web/api/write/switch-update b/web/api/write/switches
index bcf69e1..947404d 100755
--- a/web/api/write/switch-update
+++ b/web/api/write/switches
@@ -11,6 +11,7 @@ use strict;
use warnings;
use JSON;
use Data::Dumper;
+use nms::oplog qw(oplog);
$nms::web::cc{'max-age'} = "0";
@@ -84,6 +85,7 @@ foreach my $tmp2 (@tmp) {
$nms::web::dbh->do("INSERT INTO SWITCHES (ip, sysname, last_updated, locked, poll_frequency, tags, community, secondary_ip, placement,subnet4,subnet6,distro) VALUES ($template{'ip'}, $template{'sysname'}, $template{'last_updated'}, $template{'locked'}, $template{'poll_frequency'}, $template{'tags'}, $template{'community'}, $template{'secondary_ip'}, $template{'placement'},$template{'subnet4'},$template{'subnet6'},$template{'distro'});");
push @added, $switch{'sysname'};
+ oplog("\"" . $switch{'sysname'} . "\"", "Switch added: " . $switch{'sysname'});
} else {
if (defined($switch{'placement'})) {
my %placement;
diff --git a/web/index.html b/web/index.html
index 62f50df..447772f 100644
--- a/web/index.html
+++ b/web/index.html
@@ -46,34 +46,21 @@
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
- <li class="gondul-is-private"><a href="#health" onclick="setUpdater(handler_health)">Health</a></li>
- <li><a href="#ping" onclick="setUpdater(handler_ping)">Ping</a></li>
- <li><a href="#uplink" onclick="setUpdater(handler_uplinks)">Uplink</a></li>
- <li><a href="#dhcp" onclick="setUpdater(handler_dhcp)">DHCP</a></li>
- <li><a href="#temp" onclick="setUpdater(handler_temp)">Temperature</a></li>
- <li><a href="#traffic" onclick="setUpdater(handler_traffic)">Traffic</a></li>
- <li><a href="#traffictot" onclick="setUpdater(handler_traffic_tot)">Total switch traffic</a></li>
- <li class="gondul-is-private"><a href="#snmp" onclick="setUpdater(handler_snmp)">SNMP</a></li>
- <li class="gondul-is-private"><a href="#cpu" onclick="setUpdater(handler_cpu)">CPU</a></li>
- <li><a href="#disco" onclick="setUpdater(handler_disco)">DISCO</a></li>
+ <li class="gondul-is-private dropdown-header">Switches</li>
+ <li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('addSwitch')">Add switch</a></li>
+ <li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('addNetwork')">Add network</a></li>
+ <li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('listNetwork')">List networks</a></li>
+ <li class="gondul-is-private"><a href="#" onclick="nmsMap.moveSet(true);">Enable switch moving</a></li>
+ <li class="gondul-is-private"><a href="#" onclick="nmsMap.moveSet(false);">Disable switch moving</a></li>
+ <li class="gondul-is-private divider"> </li>
<li class="divider"> </li>
<li class="dropdown-header">Time</li>
<li><a href="#" onclick="toggleLayer('nowPickerBox');nmsTime.startNowPicker();">Travel in time</a></li>
<li><a href="#" onclick="nmsTime.replayEvent();" title="Replay from opening 120 minutes per second">Replay event</a></li>
<li class="divider"> </li>
<li class="dropdown-header">View</li>
- <li><a href="#" onclick="toggleNightMode()">Toggle Night Mode</a></li>
- <li><a href="#" onclick="toggleConnect()">Toggle linknets</a></li>
<li><a href="#" onclick="nmsUi.toggleVertical()">Toggle vertical mode</a></li>
<li class="divider"> </li>
- <li class="gondul-is-private dropdown-header">Switches</li>
- <li class="gondul-is-private"><a href="#" onclick="nmsMap.moveSet(true);">Enable switch moving</a></li>
- <li class="gondul-is-private"><a href="#" onclick="nmsMap.moveSet(false);">Disable switch moving</a></li>
- <li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('addSwitch')">Add switch</a></li>
- <li class="gondul-is-private divider"> </li>
- <li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('listNetwork')">List networks</a></li>
- <li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('addNetwork')">Add network</a></li>
- <li class="gondul-is-private divider"> </li>
<li class="gondul-is-private dropdown-header">Inventory lists</li>
<li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('inventoryListing','distro_name');">Distro names</a></li>
<li class="gondul-is-private"><a href="#" onclick="nmsInfoBox.showWindow('inventoryListing','sysDescr')">System description</a></li>
@@ -226,6 +213,10 @@
</tr>
<tr>
<td>9</td>
+ <td>View CPU map</td>
+ </tr>
+ <tr>
+ <td>0</td>
<td>View Disco map</td>
</tr>
<tr>
diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js
index ba6446d..c42c7ae 100644
--- a/web/js/nms-info-box.js
+++ b/web/js/nms-info-box.js
@@ -832,7 +832,7 @@ var switchAddPanel = function() {
var myData = JSON.stringify(myData);
$.ajax({
type: "POST",
- url: "/api/write/switch-add",
+ url: "/api/write/switches",
dataType: "text",
data:myData,
success: function (data, textStatus, jqXHR) {
@@ -1092,7 +1092,7 @@ var switchEditPanel = function () {
var myData = nmsInfoBox._editStringify(this.sw);
$.ajax({
type: "POST",
- url: "/api/write/switch-update",
+ url: "/api/write/switches",
dataType: "text",
data:myData,
success: function (data, textStatus, jqXHR) {
@@ -1112,7 +1112,7 @@ var switchEditPanel = function () {
myData = JSON.stringify(myData);
$.ajax({
type: "POST",
- url: "/api/write/switch-update",
+ url: "/api/write/switches",
dataType: "text",
data:myData,
success: function (data, textStatus, jqXHR) {
@@ -1317,7 +1317,7 @@ var networkAddPanel = function() {
var myData = JSON.stringify(myData);
$.ajax({
type: "POST",
- url: "/api/write/network-add",
+ url: "/api/write/networks",
dataType: "text",
data:myData,
success: function (data, textStatus, jqXHR) {
@@ -1355,7 +1355,7 @@ var networkListPanel = function() {
var cell3 = row.insertCell(2);
cell1.innerHTML = "<a href='#' onclick='nmsInfoBox.showWindow(\"networkInfo\",\""+net+"\");'>"+net+ '</a>';
cell2.innerHTML = networks[net].vlan;
- cell3.innerHTML = networks[net].routing_point;
+ cell3.innerHTML = networks[net].router;
}
this._render(table);
@@ -1401,14 +1401,9 @@ var networkEditPanel = function() {
var tags;
for (var v in net) {
/*
- * Placement and tags needs to be sent and edited
+ * Tags needs to be sent and edited
* as plain JSON...
*/
- if (v == "placement") {
- place = JSON.stringify(net[v]);
- template[v] = place;
- continue;
- }
if (v == "tags") {
tags = JSON.stringify(net[v]);
template[v] = tags;
@@ -1482,7 +1477,7 @@ var networkEditPanel = function() {
var myData = nmsInfoBox._editStringify(this.sw,"name");
$.ajax({
type: "POST",
- url: "/api/write/network-update",
+ url: "/api/write/networks",
dataType: "text",
data:myData,
success: function (data, textStatus, jqXHR) {
@@ -1491,6 +1486,7 @@ var networkEditPanel = function() {
nmsInfoBox.hide();
}
nmsData.invalidate("switches");
+ nmsData.invalidate("networks");
nmsData.invalidate("smanagement");
}
});
diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js
index 9f0c548..90f6922 100644
--- a/web/js/nms-map-handlers.js
+++ b/web/js/nms-map-handlers.js
@@ -92,6 +92,11 @@ var handler_mgmt = {
tag:"mgmt",
name:"Management info"
};
+var handler_net = {
+ getInfo:networkInfo,
+ tag:"net",
+ name:"Network info"
+};
var handler_snmpup = {
getInfo:snmpUpInfo,
tag:"snmpup",
@@ -131,6 +136,7 @@ var handlerInfo = function(tag,desc) {
var handlers = [
handler_health,
handler_mgmt,
+ handler_net,
handler_uplinks,
handler_temp,
handler_ping,
@@ -160,32 +166,34 @@ function uplinkInfo(sw)
ret.data[0].description = "Uplinks (live/configured)";
if (nmsData.switches.switches[sw].subnet4 == undefined ||
nmsData.switches.switches[sw].subnet4 == null) {
- if (tagged(sw,'3up')) {
- known_t = 3;
- } else if (tagged(sw,'2up')) {
- known_t = 2;
- } else if (tagged(sw, '1up')) {
- known_t = 1;
- } else if (tagged(sw,'4up')) {
- known_t = 4;
- }
- if (known_t != t) {
- ret.data[0].value += "(Overridden: " + known_t + ")";
- }
-
- if (u == known_t) {
- ret.score = 0;
- ret.why = "All uplinks up";
- } else if (u == 1) {
- ret.score = 800;
- ret.why = "Only 1 of " + known_t + " uplinks alive";
- } else if (u < known_t) {
- ret.score = 450;
- ret.why = u + " of " + known_t + " uplinks alive";
- } else if (u > known_t) {
- ret.score = 350;
- ret.why = u + " of " + known_t + " uplinks alive";
- }
+ if (tagged(sw,'3up')) {
+ known_t = 3;
+ } else if (tagged(sw,'2up')) {
+ known_t = 2;
+ } else if (tagged(sw, '1up')) {
+ known_t = 1;
+ } else if (tagged(sw,'4up')) {
+ known_t = 4;
+ }
+ if (known_t != t) {
+ ret.data[0].value += "(Overridden: " + known_t + ")";
+ }
+ if (u == known_t) {
+ ret.score = 0;
+ ret.why = "All uplinks up";
+ } else if (u == 1) {
+ ret.score = 800;
+ ret.why = "Only 1 of " + known_t + " uplinks alive";
+ } else if (u < known_t && !(t >= 10 && u <5)) {
+ ret.score = 450;
+ ret.why = u + " of " + known_t + " uplinks alive";
+ } else if (u > known_t) {
+ ret.score = 350;
+ ret.why = u + " of " + known_t + " uplinks alive";
+ } else if (u < known_t && (t >= 10 && u < 5)) {
+ ret.score = 150;
+ ret.why = u + " of " + known_t + " uplinks alive (huge diff suggests WIP - downgrading)";
+ }
}
}
if (testTree(nmsData,['switchstate','switches',sw,'clients','total'])) {
@@ -479,8 +487,12 @@ function pingInfo(sw)
if (!(distro == "" || phy == "" || distro == undefined || phy == undefined)) {
if (testTree(nmsData,['snmp','snmp',distro, 'ports',phy,'ifOperStatus'])) {
var x = nmsData['snmp']['snmp'][distro]['ports'][phy]['ifOperStatus'];
- var ping = parseFloat(nmsData["ping"]["switches"][sw]["latency4"]);
- var ping6 = parseFloat(nmsData["ping"]["switches"][sw]["latency6"]);
+ var ping = "no";
+ var ping6 = "no ";
+ try {
+ ping = parseFloat(nmsData["ping"]["switches"][sw]["latency4"]);
+ ping6 = parseFloat(nmsData["ping"]["switches"][sw]["latency6"]);
+ } catch(e) {}
if (x == "up") {
ret.data[3] = {};
ret.data[3].description = "Distro-port";
@@ -493,7 +505,8 @@ function pingInfo(sw)
}
}
} catch(e) {
- console.log("lol");
+ console.log("Lazy about errors....");
+ console.log(e);
}
}
return ret;
@@ -598,7 +611,7 @@ function dhcpInfo(sw) {
if (testTree(nmsData,['switchstate','switches',sw,'clients','live'])) {
var tu = parseInt(nmsData.switchstate.switches[sw].clients.live);
var tt = parseInt(nmsData.switchstate.switches[sw].clients.total);
- if (tu - dhcpClients > 5) {
+ if (tu - dhcpClients > 12) {
if (ret.score < 450) {
ret.score = 450;
ret.why = "Far more client ports than dhcp clients";
@@ -868,20 +881,69 @@ function tagged(sw, tag) {
return false;
}
+function networkInfo(sw) {
+ var ret = new handlerInfo("net","Network info");
+ ret.score = 0;
+ ret.why = "All good";
+ if (testTree(nmsData,['smanagement','switches',sw])) {
+ var i = 0;
+ var mg = nmsData.smanagement.switches[sw];
+ var objs = [{
+ d: "Management",
+ v: setTree(nmsData,['networks','networks',mg.mgmt_vlan],undefined)
+ },{
+ d: "Traffic",
+ v: setTree(nmsData,['networks','networks',mg.traffic_vlan],undefined)
+ }
+ ];
+ for (var x in objs) {
+ a = objs[x];
+ if (a.v == undefined) {
+ ret.data[i++] = {
+ value: 'Not set',
+ description: a.d + ' network'
+ };
+ continue;
+ }
+
+ ret.data[i++] = {
+ value: a.v.name || "Not set",
+ description: a.d + " network"
+ }
+ ret.data[i++] = {
+ value: a.v.vlan || "Not set",
+ description: a.d + " vlan"
+ }
+ ret.data[i++] = {
+ value: a.v.subnet4 || "Not set",
+ description: a.d + " subnet IPv4"
+ }
+ ret.data[i++] = {
+ value: a.v.gw4 || "Not set",
+ description: a.d + " gw IPv4"
+ }
+ ret.data[i++] = {
+ value: a.v.subnet6 || "Not set",
+ description: a.d + " subnet IPv6"
+ }
+ ret.data[i++] = {
+ value: a.v.gw6 || "Not set",
+ description: a.d + " gw IPv6"
+ }
+ ret.data[i++] = {
+ value: a.v.router || "Not set",
+ description: a.d + " net router"
+ }
+ }
+ }
+ return ret;
+}
function mgmtInfo(sw) {
var ret = new handlerInfo("mgmt","Management info");
ret.score = 0;
ret.why = "All good";
if (testTree(nmsData,['smanagement','switches',sw])) {
var mg = nmsData.smanagement.switches[sw];
- var traffic_vlan = "N/A";
- var mgmt_vlan = "N/A";
- if (testTree(nmsData,['networks','networks',mg.traffic_vlan,"vlan"])) {
- traffic_vlan = nmsData["networks"]["networks"][mg.traffic_vlan]["vlan"];
- }
- if (testTree(nmsData,['networks','networks',mg.mgmt_vlan,"vlan"])) {
- mgmt_vlan = nmsData["networks"]["networks"][mg.mgmt_vlan]["vlan"];
- }
ret.data =
[{
value: mg.mgmt_v4_addr || "N/A",
@@ -890,20 +952,8 @@ function mgmtInfo(sw) {
value: mg.mgmt_v6_addr || "N/A",
description: "Management IP (v6)"
}, {
- value: mg.subnet4 || "N/A",
- description: "Subnet (v4)"
- }, {
- value: mg.subnet6 || "N/A",
- description: "Subnet (v6)"
- }, {
value: mg.distro_name || "N/A",
description: "Distro"
- }, {
- value: traffic_vlan || "N/A",
- description: "Client VLAN"
- }, {
- value: mgmt_vlan || "N/A",
- description: "Management VLAN"
}
];
if ((mg.mgmt_v4_addr == undefined || mg.mgmt_v4_addr == "") && (mg.mgmt_v6_addr == undefined || mg.mgmt_v6_addr == "")) {
diff --git a/web/js/nms-map.js b/web/js/nms-map.js
index 1ebcf92..5927324 100644
--- a/web/js/nms-map.js
+++ b/web/js/nms-map.js
@@ -218,7 +218,7 @@ nmsMap.drawNow = function ()
} else {
now = new Date(nmsData.now); //Date assumes UTC
}
- now = now.toString().split(' ').splice(1,4).join(' '); //Date returns local time
+ now = now.toString().split(' ').splice(0,5).join(' '); //Date returns local time
if (nmsMap._lastNow == now) {
nmsMap.stats.nowDups++;
return;
@@ -231,6 +231,7 @@ nmsMap.drawNow = function ()
ctx.clearRect(0,0,800,100);
ctx.fillStyle = "white";
ctx.strokeStyle = "black";
+ ctx.translate(200,0);
ctx.lineWidth = nms.fontLineFactor;
ctx.strokeText(now, this._settings.textMargin, 25);
ctx.fillText(now, this._settings.textMargin, 25);
diff --git a/web/js/nms-time.js b/web/js/nms-time.js
index 30604cd..482cfa7 100644
--- a/web/js/nms-time.js
+++ b/web/js/nms-time.js
@@ -18,7 +18,7 @@ nmsTime.replayEvent = function() {
var eStart = setTree(nmsData,["config","config","data","start"],"2018-03-23T00:00:00+0200");
nmsTime._stopTime = new Date(setTree(nmsData,["config","config","data","end"],"2018-04-01T14:30:00+0200"));
nmsTime.setNow(eStart);
- nmsTime.startPlayback(10);
+ nmsTime.startPlayback(60);
}
nmsTime.isRealTime = function() {
@@ -135,7 +135,7 @@ nmsTime.startPlayback = function(speed) {
return;
}
nmsTime._speed = speed;
- nmsTime._handle = setInterval(nmsTime._tick,1000);
+ nmsTime._handle = setInterval(nmsTime._tick,2000);
}
nmsTime.togglePause = function() {
@@ -145,7 +145,7 @@ nmsTime.togglePause = function() {
if (nmsTime.isRealTime()) {
nmsTime.setNow(Date.now());
} else {
- nmsTime.startPlayback(nmsTime._speed ? nmsTime._speed : 5);
+ nmsTime.startPlayback(nmsTime._speed ? nmsTime._speed : 60);
}
}
}
diff --git a/web/js/nms.js b/web/js/nms.js
index 62a148c..0422f00 100644
--- a/web/js/nms.js
+++ b/web/js/nms.js
@@ -77,10 +77,12 @@ var nms = {
'8':setMapModeFromN,
'9':setMapModeFromN,
'c':toggleConnect,
+ 'H':moveTimeFromKey,
'h':moveTimeFromKey,
'j':moveTimeFromKey,
'k':moveTimeFromKey,
'l':moveTimeFromKey,
+ 'L':moveTimeFromKey,
'p':moveTimeFromKey,
'r':moveTimeFromKey,
'o':toggleOplog,
@@ -502,6 +504,9 @@ function setMapModeFromN(e,key)
setUpdater(handler_snmp);
break;
case '9':
+ setUpdater(handler_cpu);
+ break;
+ case '0':
setUpdater(handler_disco);
break;
}
@@ -511,6 +516,9 @@ function setMapModeFromN(e,key)
function moveTimeFromKey(e,key)
{
switch(key) {
+ case 'H':
+ nmsTime.stepKey(-1440);
+ break;
case 'h':
nmsTime.stepKey(-60);
break;
@@ -523,6 +531,9 @@ function moveTimeFromKey(e,key)
case 'l':
nmsTime.stepKey(60);
break;
+ case 'L':
+ nmsTime.stepKey(1440);
+ break;
case 'p':
nmsTime.togglePause();
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 03:27:46 +0000