From eabcf10ede6f9eee77b85f537cef023f89111f9d Mon Sep 17 00:00:00 2001 From: "Ole Mathias Aa. Heggem" Date: Sun, 5 Nov 2017 23:33:04 +0100 Subject: influx/chart and ansible --- ansible/inventory-localhost | 2 + ansible/roles/influx/main.yml | 14 + ansible/roles/postgres/files/schema.sql | 587 ++++++++++++++++++++++++++++++++ ansible/roles/postgres/tasks/main.yml | 18 +- ansible/roles/web/files/gondul.conf | 3 + ansible/site.yml | 5 +- collectors/ping.pl | 53 ++- collectors/snmpfetchng.pl | 123 ++++++- include/config.pm | 5 + include/nms.pm | 12 +- web/index.html | 9 +- web/js/Chart.min.js | 10 + web/js/moment.min.js | 7 + web/js/nms-draw-chart.js | 337 ++++++++++++++++++ web/js/nms-info-box.js | 42 ++- 15 files changed, 1183 insertions(+), 44 deletions(-) create mode 100644 ansible/roles/influx/main.yml create mode 100644 ansible/roles/postgres/files/schema.sql create mode 100644 web/js/Chart.min.js create mode 100644 web/js/moment.min.js create mode 100644 web/js/nms-draw-chart.js diff --git a/ansible/inventory-localhost b/ansible/inventory-localhost index ee4e0bc..9481f45 100644 --- a/ansible/inventory-localhost +++ b/ansible/inventory-localhost @@ -8,3 +8,5 @@ localhost ansible_connection=local localhost ansible_connection=local [snmp] localhost ansible_connection=local +[influx] +localhost ansible_connection=local diff --git a/ansible/roles/influx/main.yml b/ansible/roles/influx/main.yml new file mode 100644 index 0000000..74a6666 --- /dev/null +++ b/ansible/roles/influx/main.yml @@ -0,0 +1,14 @@ +- name: Import InfluxDB GPG signing key + apt_key: url=https://repos.influxdata.com/influxdb.key state=present + +- name: Add InfluxDB repository + apt_repository: repo='deb https://repos.influxdata.com/debian jessie stable' state=present + +- name: Install InfluxDB packages + apt: name=influxdb state=present update_cache=yes + +- name: Start the InfluxDB service + service: name=influxdb state=started + +- name: Create database +command: /usr/bin/influx -execute 'CREATE DATABASE gondul' diff --git a/ansible/roles/postgres/files/schema.sql b/ansible/roles/postgres/files/schema.sql new file mode 100644 index 0000000..41d513d --- /dev/null +++ b/ansible/roles/postgres/files/schema.sql @@ -0,0 +1,587 @@ +-- +-- PostgreSQL database dump +-- + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SET check_function_bodies = false; +SET client_min_messages = warning; + +-- +-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: +-- + +CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; + + +-- +-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: +-- + +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 ( + 'active', + 'inactive', + 'persist', + 'delete' +); + + +ALTER TYPE comment_state OWNER TO nms; + +SET default_tablespace = ''; + +SET default_with_oids = false; + +-- +-- Name: config; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE config ( + id integer NOT NULL, + publicvhost character varying, + shortname character varying, + data jsonb +); + + +ALTER TABLE config OWNER TO nms; + +-- +-- Name: config_id_seq; Type: SEQUENCE; Schema: public; Owner: nms +-- + +CREATE SEQUENCE config_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE 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; + + +-- +-- Name: dhcp; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE dhcp ( + switch integer, + "time" timestamp with time zone, + mac macaddr, + ip inet, + dhcp_server integer +); + + +ALTER TABLE dhcp OWNER TO nms; + +-- +-- Name: linknet_ping; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE linknet_ping ( + linknet integer NOT NULL, + "time" timestamp with time zone DEFAULT now() NOT NULL, + latency1_ms double precision, + latency2_ms double precision +); + + +ALTER TABLE linknet_ping OWNER TO nms; + +-- +-- Name: linknets; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE linknets ( + linknet integer NOT NULL, + switch1 integer NOT NULL, + addr1 inet, + switch2 integer NOT NULL, + addr2 inet, + port1 character varying(10), + port2 character varying(10) +); + + +ALTER TABLE linknets OWNER TO nms; + +-- +-- Name: linknets_linknet_seq; Type: SEQUENCE; Schema: public; Owner: nms +-- + +CREATE SEQUENCE linknets_linknet_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE 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; + + +-- +-- Name: oplog; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE oplog ( + id integer NOT NULL, + "time" timestamp with time zone DEFAULT now(), + systems character varying, + username character varying, + log text +); + + +ALTER TABLE oplog OWNER TO nms; + +-- +-- Name: oplog_id_seq; Type: SEQUENCE; Schema: public; Owner: nms +-- + +CREATE SEQUENCE oplog_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE 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; + + +-- +-- Name: ping; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE ping ( + switch integer NOT NULL, + "time" timestamp with time zone DEFAULT now() NOT NULL, + latency_ms double precision +); + + +ALTER TABLE ping OWNER TO nms; + +-- +-- Name: ping_secondary_ip; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE 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; + +-- +-- Name: seen_mac; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE 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; + +-- +-- Name: snmp; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE snmp ( + "time" timestamp without time zone DEFAULT now() NOT NULL, + switch integer NOT NULL, + data jsonb, + id integer NOT NULL +); + + +ALTER TABLE snmp OWNER TO nms; + +-- +-- Name: snmp_id_seq; Type: SEQUENCE; Schema: public; Owner: nms +-- + +CREATE SEQUENCE snmp_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE 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; + + +-- +-- Name: switches; Type: TABLE; Schema: public; Owner: nms; Tablespace: +-- + +CREATE TABLE 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, + 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 +); + + +ALTER TABLE switches OWNER TO nms; + +-- +-- Name: switches_switch_seq; Type: SEQUENCE; Schema: public; Owner: nms +-- + +CREATE SEQUENCE switches_switch_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE switches_switch_seq OWNER TO nms; + +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY config ALTER COLUMN id SET DEFAULT nextval('config_id_seq'::regclass); + + +-- +-- Name: linknet; Type: DEFAULT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY linknets ALTER COLUMN linknet SET DEFAULT nextval('linknets_linknet_seq'::regclass); + + +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY oplog ALTER COLUMN id SET DEFAULT nextval('oplog_id_seq'::regclass); + + +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY snmp ALTER COLUMN id SET DEFAULT nextval('snmp_id_seq'::regclass); + + +-- +-- Name: seen_mac_pkey; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace: +-- + +ALTER TABLE ONLY seen_mac + ADD CONSTRAINT seen_mac_pkey PRIMARY KEY (mac, address, seen); + + +-- +-- Name: switches_pkey; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace: +-- + +ALTER TABLE ONLY switches + ADD CONSTRAINT switches_pkey PRIMARY KEY (switch); + + +-- +-- Name: switches_sysname_key; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace: +-- + +ALTER TABLE ONLY switches + ADD CONSTRAINT switches_sysname_key UNIQUE (sysname); + + +-- +-- Name: switches_sysname_key1; Type: CONSTRAINT; Schema: public; Owner: nms; Tablespace: +-- + +ALTER TABLE ONLY switches + ADD CONSTRAINT switches_sysname_key1 UNIQUE (sysname); + + +-- +-- Name: dhcp_ip; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX dhcp_ip ON dhcp USING btree (ip); + + +-- +-- Name: dhcp_mac; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX dhcp_mac ON dhcp USING btree (mac); + + +-- +-- Name: dhcp_switch; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX dhcp_switch ON dhcp USING btree (switch); + + +-- +-- Name: dhcp_time; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX dhcp_time ON dhcp USING btree ("time"); + + +-- +-- Name: ping_index; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX ping_index ON ping USING btree ("time"); + + +-- +-- Name: ping_secondary_index; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX ping_secondary_index ON ping_secondary_ip USING btree ("time"); + + +-- +-- Name: seen_mac_addr_family; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX seen_mac_addr_family ON seen_mac USING btree (family(address)); + + +-- +-- Name: seen_mac_seen; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX seen_mac_seen ON seen_mac USING btree (seen); + + +-- +-- Name: snmp_time; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX snmp_time ON snmp USING btree ("time"); + + +-- +-- Name: snmp_time15; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX snmp_time15 ON snmp USING btree (id, switch); + + +-- +-- Name: snmp_time6; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX snmp_time6 ON snmp USING btree ("time" DESC, switch); + + +-- +-- Name: switches_switch; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX switches_switch ON switches USING hash (switch); + + +-- +-- Name: updated_index2; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX updated_index2 ON linknet_ping USING btree ("time"); + + +-- +-- Name: updated_index3; Type: INDEX; Schema: public; Owner: nms; Tablespace: +-- + +CREATE INDEX updated_index3 ON ping_secondary_ip USING btree ("time"); + + +-- +-- Name: dhcp_switch_fkey; Type: FK CONSTRAINT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY dhcp + ADD CONSTRAINT dhcp_switch_fkey FOREIGN KEY (switch) REFERENCES switches(switch); + + +-- +-- Name: snmp_switch_fkey; Type: FK CONSTRAINT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY snmp + ADD CONSTRAINT snmp_switch_fkey FOREIGN KEY (switch) REFERENCES switches(switch); + + +-- +-- Name: switchname; Type: FK CONSTRAINT; Schema: public; Owner: nms +-- + +ALTER TABLE ONLY ping + ADD CONSTRAINT switchname FOREIGN KEY (switch) REFERENCES switches(switch); + + +-- +-- Name: public; Type: ACL; Schema: -; Owner: postgres +-- + +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; + + +-- +-- Name: config; 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; + + +-- +-- Name: dhcp; 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; + + +-- +-- Name: linknet_ping; 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; + + +-- +-- Name: linknets; 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; + + +-- +-- Name: 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; + + +-- +-- Name: 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; + + +-- +-- Name: 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; + + +-- +-- Name: 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; + + +-- +-- Name: 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; + + +-- +-- Name: 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; + + +-- +-- PostgreSQL database dump complete +-- + diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index ee53327..14174bd 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -5,10 +5,16 @@ with_items: - postgresql-9.4 - python-psycopg2 + - sudo - name: Drop postgresql-config copy: dest: /etc/postgresql/9.4/main/postgresql.conf src: postgresql.conf +- name: Add db to hosts + lineinfile: + dest: /etc/hosts + line: "127.0.0.1 db" + state: present - name: Whoami become: false command: whoami @@ -24,8 +30,10 @@ name: nms - name: Ensure a valid postgres-user become_user: postgres - postgresql_user: - db: nms - name: nms - password: risbrod - + postgresql_user: + db: nms + name: nms + password: risbrod +- name: Import SQL + become_user: postgres +shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql diff --git a/ansible/roles/web/files/gondul.conf b/ansible/roles/web/files/gondul.conf index 0cdbff7..3c6de86 100644 --- a/ansible/roles/web/files/gondul.conf +++ b/ansible/roles/web/files/gondul.conf @@ -27,6 +27,9 @@ Require all granted + ProxyPass "/query" "http://localhost:8086/query" + ProxyPassReverse "/query" "http://localhost:8086/query" + ErrorLog /var/log/apache2/error-nms.example.com.log # Possible values include: debug, info, notice, warn, error, crit, diff --git a/ansible/site.yml b/ansible/site.yml index 7961f21..40ea35c 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -10,6 +10,10 @@ become: true roles: - web +- hosts: influx + become: true + roles: + - influx - hosts: ping become: true roles: @@ -18,4 +22,3 @@ become: true roles: - snmp - diff --git a/collectors/ping.pl b/collectors/ping.pl index 408f414..952932a 100755 --- a/collectors/ping.pl +++ b/collectors/ping.pl @@ -16,6 +16,8 @@ my $dbh = nms::db_connect(); $dbh->{AutoCommit} = 0; $dbh->{RaiseError} = 1; +my $influx = nms::influx_connect(); + my $q = $dbh->prepare("SELECT switch,sysname,host(mgmt_v4_addr) as ip,host(mgmt_v6_addr) as secondary_ip FROM switches WHERE mgmt_v4_addr is not null or mgmt_v6_addr is not null ORDER BY random();"); my $lq = $dbh->prepare("SELECT linknet,addr1,addr2 FROM linknets WHERE addr1 is not null and addr2 is not null;"); @@ -79,8 +81,31 @@ while (1) { } $latency //= "\\N"; $dbh->pg_putcopydata("$switch\t$latency\n"); + if($latency ne "\\N") { + my $cv = AE::cv; + $influx->write( + database => $nms::config::influx_database, + data => [ + { + measurement => 'ping', + tags => { + switch => $sysname, + ip => $ip, + version => 'v4' + }, + fields => { + latency => $latency, + }, + }], + on_success => $cv, + on_error => sub { + $cv->croak("Failed to write data: @_"); + } + ); + $cv->recv; + } } - + if ($drops > 0) { print "$drops "; @@ -95,6 +120,29 @@ while (1) { $latency //= "\\N"; $dbh->pg_putcopydata("$switch\t$latency\n"); + if($latency ne "\\N") { + my $cv = AE::cv; + $influx->write( + database => $nms::config::influx_database, + data => [ + { + measurement => 'ping', + tags => { + switch => $sysname, + ip => $ip, + version => 'v6' + }, + fields => { + latency => $latency, + }, + }], + on_success => $cv, + on_error => sub { + $cv->croak("Failed to write data: @_"); + } + ); + $cv->recv; + } } $dbh->pg_putcopyend(); @@ -110,7 +158,7 @@ while (1) { $ping->host_add($ref->{'addr1'}); $ping->host_add($ref->{'addr2'}); } - if (@linknets) { + if (@linknets) { $result = $ping->ping(); die $ping->get_error if (!defined($result)); @@ -125,4 +173,3 @@ while (1) { } $dbh->commit; } - diff --git a/collectors/snmpfetchng.pl b/collectors/snmpfetchng.pl index 1d352a1..0ace8c4 100755 --- a/collectors/snmpfetchng.pl +++ b/collectors/snmpfetchng.pl @@ -9,6 +9,8 @@ use Data::Dumper; use lib '/opt/gondul/include'; use nms qw(convert_mac convert_decimal); use IO::Socket::IP; +use Scalar::Util qw(looks_like_number); +use Time::HiRes qw(time); SNMP::initMib(); SNMP::addMibDirs("/opt/gondul/data/mibs/StandardMibs"); @@ -20,15 +22,16 @@ our $dbh = nms::db_connect(); $dbh->{AutoCommit} = 0; $dbh->{RaiseError} = 1; +my $influx = nms::influx_connect(); my $qualification = <<"EOF"; (last_updated IS NULL OR now() - last_updated > poll_frequency) AND (locked='f' OR now() - last_updated > '15 minutes'::interval) AND (mgmt_v4_addr is not null or mgmt_v6_addr is not null) EOF -# Borrowed from snmpfetch.pl +# Borrowed from snmpfetch.pl our $qswitch = $dbh->prepare(<<"EOF") -SELECT +SELECT sysname,switch,host(mgmt_v4_addr) as ip,host(mgmt_v6_addr) as ip2,community, DATE_TRUNC('second', now() - last_updated - poll_frequency) AS overdue FROM @@ -111,7 +114,6 @@ sub callback{ my %nics; my @nicids; my $total = 0; - my $now_graphite = time(); my %tree2; for my $ret (@top) { @@ -122,29 +124,103 @@ sub callback{ if ($tag eq "ifPhysAddress" or $tag eq "jnxVirtualChassisMemberMacAddBase") { $val = convert_mac($val); } - $tree{$iid}{$tag} = $val; - if ($tag eq "ifIndex") { + elsif ($tag eq "ifIndex") { push @nicids, $iid; } - if ($tag =~ m/^jnxVirtualChassisMember/) { + elsif ($tag =~ m/^jnxVirtualChassisMember/) { $tree2{'vcm'}{$tag}{$iid} = $val; } - if ($tag =~ m/^jnxVirtualChassisPort/ ) { + elsif ($tag =~ m/^jnxVirtualChassisPort/ ) { my ($member,$lol,$interface) = split(/\./,$iid,3); my $decoded_if = convert_decimal($interface); $tree2{'vcp'}{$tag}{$member}{$decoded_if} = $val; } + elsif($tag eq "dot1dBasePortIfIndex") { + $val = $inner->iid; + $iid = $inner->val; + } + elsif($tag eq "dot1qTpFdbPort") { + $iid = substr(mac_dec_to_hex($iid),-17); + } + elsif($tag eq "ipNetToMediaPhysAddress") { + my @ip = split(/\./, $iid); + $iid = lc $ip[1].".".$ip[2].".".$ip[3].".".$ip[4]; + $val = unpack 'H*', $val; + $val =~ s/(..)(?=.)/$1:/g; + } + elsif($tag eq "ipv6NetToMediaPhysAddress") { + $val = unpack 'H*', $val; + $val =~ s/(..)(?=.)/$1:/g; + my @ip = split(/\./, $iid); + $iid = sprintf("%X%X:%X%X:%X%X:%X%X:%X%X:%X%X:%X%X:%X%X", @ip[1], @ip[2], @ip[3], @ip[4], @ip[5], @ip[6], @ip[7], @ip[8], @ip[9], @ip[10], @ip[11], @ip[12], @ip[13], @ip[14], @ip[15], @ip[16]); + } + $tree{$iid}{$tag} = $val; } } } for my $nic (@nicids) { $tree2{'ports'}{$tree{$nic}{'ifName'}} = $tree{$nic}; + my $tmp_field = ''; + for my $tmp_key (keys $tree{$nic}) { + if(looks_like_number($tree{$nic}{$tmp_key})) { + $tmp_field = $tree{$nic}{$tmp_key}; + } else { + $tmp_field = '"'.$tree{$nic}{$tmp_key}.'"'; + } + + my $cv = AE::cv; + $influx->write( + database => $nms::config::influx_database, + data => [ + { + measurement => 'ports', + tags => { + switch => $switch{'sysname'}, + interface => $tree{$nic}{'ifName'}, + }, + fields => { $tmp_key => $tmp_field }, + }], + on_success => $cv, + on_error => sub { + $cv->croak("Failed to write data: @_"); + } + ); + $cv->recv; + } + delete $tree{$nic}; } for my $iid (keys %tree) { + my $tmp_field = ''; for my $key (keys %{$tree{$iid}}) { $tree2{'misc'}{$key}{$iid} = $tree{$iid}{$key}; + + if(looks_like_number($tree{$iid}{$key})) { + $tmp_field = $tree{$iid}{$key}; + } else { + $tmp_field = '"'.$tree{$iid}{$key}.'"'; + } + + my $cv = AE::cv; + $influx->write( + database => $nms::config::influx_database, + data => [ + { + measurement => 'snmp', + tags => { + switch => $switch{'sysname'}, + }, + fields => { $key => $tmp_field }, + }], + on_success => $cv, + on_error => sub { + $cv->croak("Failed to write data: @_"); + } + ); + $cv->recv; + + } } if ($total > 0) { @@ -154,13 +230,42 @@ sub callback{ or die "Couldn't unlock switch"; $dbh->commit; if ($total > 0) { - if ((time - $switch{'start'}) > 10) { - mylog( "Polled $switch{'sysname'} in " . (time - $switch{'start'}) . "s."); + my $cv = AE::cv; + $influx->write( + database => $nms::config::influx_database, + data => [ + { + measurement => 'snmp', + tags => { + switch => $switch{'sysname'}, + }, + fields => { 'execution_time' => (time - $switch{'start'}) }, + }], + on_success => $cv, + on_error => sub { + $cv->croak("Failed to write data: @_"); + } + ); + $cv->recv; + + if ((time - $switch{'start'}) > 10) { + mylog( "Polled $switch{'sysname'} in " . (time - $switch{'start'}) . "s."); } } else { mylog( "Polled $switch{'sysname'} in " . (time - $switch{'start'}) . "s - no data. Timeout?"); } } + +sub mac_dec_to_hex{ + my $dec_mac = "@_"; + my @octets; + + foreach my $octet (split('\.', $dec_mac)){ + push(@octets, sprintf("%02x", $octet)); + } + return join(':', @octets); +} + while (1) { inner_loop(); } diff --git a/include/config.pm b/include/config.pm index a45caf9..624770a 100755 --- a/include/config.pm +++ b/include/config.pm @@ -11,6 +11,11 @@ our $db_password = "risbrod"; our $graphite_host = "graphite"; our $graphite_port = "2003"; +# Influx +our $influx_host = "http://localhost:8086"; +our $influx_username = "admin"; +our $influx_password = "admin"; + # Max SNMP polls to fire off at the same time. our $snmp_max = 20; diff --git a/include/nms.pm b/include/nms.pm index 3133042..ce304d8 100755 --- a/include/nms.pm +++ b/include/nms.pm @@ -5,6 +5,7 @@ use DBI; use Data::Dumper; use FileHandle; use JSON; +use AnyEvent::InfluxDB; package nms; use base 'Exporter'; @@ -26,7 +27,16 @@ sub db_connect { $nms::config::db_username, $nms::config::db_password, {AutoCommit => 0}) or die "Couldn't connect to database"; - return $dbh; + return $dbh; +} + +sub influx_connect { + my $ix = AnyEvent::InfluxDB->new( + server => $nms::config::influx_host, + username => $nms::config::influx_username, + password => $nms::config::influx_password, + ) or die "Couldn't connect to InfluxDB"; + return $ix; } # A few utilities to convert from SNMP binary address format to human-readable. diff --git a/web/index.html b/web/index.html index 028d338..63ae4c3 100644 --- a/web/index.html +++ b/web/index.html @@ -106,7 +106,7 @@

- + @@ -256,9 +256,9 @@