author | Tero Marttila <terom@paivola.fi> |
Thu, 10 Jan 2013 19:01:22 +0200 | |
changeset 77 | 05d6cfa9efac |
parent 64 | f5f767bf4887 |
child 115 | 9772d43669fb |
permissions | -rwxr-xr-x |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
1 |
#!/usr/bin/env python |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
2 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
3 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
4 |
Monitor DHCP use. |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
5 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
6 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
7 |
__version__ = '0.0' |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
8 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
9 |
import pvl.args |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
10 |
import pvl.syslog.args |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
11 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
12 |
import pvl.verkko.db as db |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
13 |
import pvl.syslog.dhcp |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
14 |
import pvl.verkko.dhcp.leases |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
15 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
16 |
import logging, optparse |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
17 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
18 |
log = logging.getLogger('main') |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
19 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
20 |
# name of process in syslog |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
21 |
DHCP_SYSLOG_PROG = 'dhcpd' |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
22 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
23 |
def parse_options (argv) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
24 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
25 |
Parse command-line arguments. |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
26 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
27 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
28 |
prog = argv[0] |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
29 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
30 |
parser = optparse.OptionParser( |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
31 |
prog = prog, |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
32 |
usage = '%prog: [options]', |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
33 |
version = __version__, |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
34 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
35 |
# module docstring |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
36 |
description = __doc__, |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
37 |
) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
38 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
39 |
# options |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
40 |
parser.add_option_group(pvl.args.parser(parser)) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
41 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
42 |
## syslog |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
43 |
parser.add_option_group(pvl.syslog.args.parser(parser, prog=DHCP_SYSLOG_PROG)) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
44 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
45 |
## leases |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
46 |
parser.add_option('--leases-file', metavar='FILE', |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
47 |
help="Synchronize dhcpd leases from given file") |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
48 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
49 |
parser.add_option('--leases-tail', type='float', metavar='POLL', |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
50 |
help="Continuously poll leases file XXX: overrides --syslog-tail") |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
51 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
52 |
|
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
53 |
## XXX: networks |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
54 |
parser.add_option('--network', metavar='NET', action='append', |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
55 |
help="Filter leases by network prefix as plugin instance") |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
56 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
57 |
parser.add_option('--gateway', metavar='GW/IFACE', action='append', |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
58 |
help="Filter messages by gateway/interface as plugin instance") |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
59 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
60 |
## hosts |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
61 |
parser.add_option('--database', metavar='URI', |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
62 |
help="Track hosts in given database") |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
63 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
64 |
parser.add_option('--create', action='store_true', |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
65 |
help="Initialize database") |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
66 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
67 |
# defaults |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
68 |
parser.set_defaults( |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
69 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
70 |
) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
71 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
72 |
# parse |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
73 |
options, args = parser.parse_args(argv[1:]) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
74 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
75 |
# apply |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
76 |
pvl.args.apply(options, prog) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
77 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
78 |
if not options.database : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
79 |
parser.error("Missing required option: --database") |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
80 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
81 |
return options, args |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
82 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
83 |
class DHCPHostsDatabase (object) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
84 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
85 |
The dhcp_hosts table in our database. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
86 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
87 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
88 |
def __init__ (self, db) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
89 |
self.db = db |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
90 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
91 |
def create (self) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
92 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
93 |
CREATE TABLEs |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
94 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
95 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
96 |
log.info("Creating database tables: dhcp_hosts") |
33
768983d2e71d
pvl.verkko-dhcp: use CREATE IF NOT EXISTS for --create
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
97 |
db.dhcp_hosts.create(self.db.engine, checkfirst=True) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
98 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
99 |
def insert (self, attrs) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
100 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
101 |
INSERT new host |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
102 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
103 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
104 |
query = db.dhcp_hosts.insert().values( |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
105 |
ip = attrs['ip'], |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
106 |
mac = attrs['mac'], |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
107 |
gw = attrs['gw'], |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
108 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
109 |
first_seen = attrs['timestamp'], |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
110 |
count = 1, |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
111 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
112 |
last_seen = attrs['timestamp'], |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
113 |
state = attrs['state'], |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
114 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
115 |
name = attrs.get('name'), |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
116 |
error = attrs.get('error'), |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
117 |
) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
118 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
119 |
# -> id |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
120 |
return self.db.insert(query) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
121 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
122 |
def update (self, attrs) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
123 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
124 |
UPDATE existing host, or return False if not found. |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
125 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
126 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
127 |
table = db.dhcp_hosts |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
128 |
|
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
129 |
query = table.update() |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
130 |
query = query.where((table.c.ip == attrs['ip']) & (table.c.mac == attrs['mac']) & (table.c.gw == attrs['gw'])) |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
131 |
query = query.values( |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
132 |
count = db.func.coalesce(table.c.count, 0) + 1, |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
133 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
134 |
# set |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
135 |
last_seen = attrs['timestamp'], |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
136 |
state = attrs['state'], |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
137 |
) |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
138 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
139 |
if 'name' in attrs : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
140 |
query = query.values(name = attrs['name']) |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
141 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
142 |
if 'error' in attrs : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
143 |
query = query.values(error = attrs['error']) |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
144 |
|
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
145 |
# any matched rows? |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
146 |
return self.db.update(query) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
147 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
148 |
def process (self, item) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
149 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
150 |
Process given DHCP syslog message to update the hosts table. |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
151 |
""" |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
152 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
153 |
attrs = {} |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
154 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
155 |
# ignore unless we have enough info to fully identify the client |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
156 |
# this means that we omit DHCPDISCOVER messages, but we get the OFFER/REQUEST/ACK |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
157 |
if any(name not in item for name in ('lease', 'hwaddr', 'gateway')) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
158 |
# ignore; we require these |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
159 |
return |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
160 |
|
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
161 |
# do not override error from request on NAK; clear otherwise |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
162 |
if item.get('type') == 'DHCPNAK' : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
163 |
pass |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
164 |
else : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
165 |
attrs['error'] = item.get('error') |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
166 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
167 |
# do not override name unless known |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
168 |
if item.get('name') : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
169 |
attrs['name'] = item.get('name') |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
170 |
|
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
171 |
# db: syslog |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
172 |
ATTR_MAP = ( |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
173 |
('ip', 'lease'), |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
174 |
('mac', 'hwaddr'), |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
175 |
('gw', 'gateway'), |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
176 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
177 |
('timestamp', 'timestamp'), |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
178 |
('state', 'type'), |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
179 |
) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
180 |
|
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
181 |
# generic attrs |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
182 |
for key, name in ATTR_MAP : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
183 |
attrs[key] = item.get(name) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
184 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
185 |
# update existing? |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
186 |
if self.update(attrs) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
187 |
log.info("Update: %s", attrs) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
188 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
189 |
else : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
190 |
# new |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
191 |
log.info("Insert: %s", attrs) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
192 |
self.insert(attrs) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
193 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
194 |
class DHCPLeasesDatabase (object) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
195 |
def __init__ (self, db) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
196 |
self.db = db |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
197 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
198 |
def create (self) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
199 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
200 |
CREATE TABLEs |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
201 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
202 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
203 |
log.info("Creating database tables: dhcp_leases") |
33
768983d2e71d
pvl.verkko-dhcp: use CREATE IF NOT EXISTS for --create
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
204 |
db.dhcp_leases.create(self.db.engine, checkfirst=True) |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
205 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
206 |
def update (self, lease) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
207 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
208 |
Try an extend an existing lease? |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
209 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
210 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
211 |
c = db.dhcp_leases.c |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
212 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
213 |
ip = lease['lease'] |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
214 |
mac = lease.get('hwaddr') |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
215 |
starts = lease['starts'] |
38
959a268de543
pvl.verkko-dhcp: lease['ends'] is optional?
Tero Marttila <terom@paivola.fi>
parents:
35
diff
changeset
|
216 |
ends = lease.get('ends') |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
217 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
218 |
update = db.dhcp_leases.update() |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
219 |
|
38
959a268de543
pvl.verkko-dhcp: lease['ends'] is optional?
Tero Marttila <terom@paivola.fi>
parents:
35
diff
changeset
|
220 |
# XXX: if ends is None? |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
221 |
if mac : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
222 |
# renew lease..? |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
223 |
update = update.where((c.ip == ip) & (c.mac == mac) & ((starts < c.ends) | (c.ends == None))) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
224 |
else : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
225 |
# new state for lease..? |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
226 |
update = update.where((c.ip == ip) & ((starts < c.ends) | (c.ends == ends))) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
227 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
228 |
update = update.values( |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
229 |
state = lease['binding-state'], |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
230 |
next = lease.get('next-binding-state'), |
38
959a268de543
pvl.verkko-dhcp: lease['ends'] is optional?
Tero Marttila <terom@paivola.fi>
parents:
35
diff
changeset
|
231 |
ends = ends, |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
232 |
) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
233 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
234 |
if lease.get('client-hostname') : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
235 |
update = update.values(hostname = lease['client-hostname']) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
236 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
237 |
return self.db.update(update) > 0 |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
238 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
239 |
def insert (self, lease) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
240 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
241 |
Record a new lease. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
242 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
243 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
244 |
c = db.dhcp_leases.c |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
245 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
246 |
query = db.dhcp_leases.insert().values( |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
247 |
ip = lease['lease'], |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
248 |
mac = lease['hwaddr'], |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
249 |
hostname = lease.get('client-hostname'), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
250 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
251 |
starts = lease['starts'], |
38
959a268de543
pvl.verkko-dhcp: lease['ends'] is optional?
Tero Marttila <terom@paivola.fi>
parents:
35
diff
changeset
|
252 |
ends = lease.get('ends'), |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
253 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
254 |
state = lease['binding-state'], |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
255 |
next = lease.get('next-binding-state'), |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
256 |
) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
257 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
258 |
return self.db.insert(query) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
259 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
260 |
def process (self, lease) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
261 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
262 |
Process given DHCP lease to update currently active lease, or insert a new one. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
263 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
264 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
265 |
# update existing? |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
266 |
if self.update(lease) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
267 |
log.info("Update: %s", lease) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
268 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
269 |
elif lease.get('hwaddr') : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
270 |
# new |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
271 |
id = self.insert(lease) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
272 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
273 |
log.info("Insert: %s -> %d", lease, id) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
274 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
275 |
else : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
276 |
# may be a free lease |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
277 |
log.warn("Ignored lease: %s", lease) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
278 |
|
34
491f7da9d29b
pvl.verkko-dhcp: fix polling without syslog; README
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
279 |
# XXX: mainloop |
491f7da9d29b
pvl.verkko-dhcp: fix polling without syslog; README
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
280 |
import time |
491f7da9d29b
pvl.verkko-dhcp: fix polling without syslog; README
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
281 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
282 |
class DHCPHandler (object) : |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
283 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
284 |
Process lines from syslog |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
285 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
286 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
287 |
def __init__ (self, db, syslog, leases) : |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
288 |
self.db = db |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
289 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
290 |
self.syslog = syslog |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
291 |
self.leases = leases |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
292 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
293 |
self.hostdb = DHCPHostsDatabase(db) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
294 |
self.leasedb = DHCPLeasesDatabase(db) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
295 |
|
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
296 |
# XXX |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
297 |
self.filter = pvl.syslog.dhcp.DHCPSyslogFilter() |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
298 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
299 |
def createdb (self) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
300 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
301 |
Initialize database tables. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
302 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
303 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
304 |
self.hostdb.create() |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
305 |
self.leasedb.create() |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
306 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
307 |
def process_syslog (self, item) : |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
308 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
309 |
Handle a single item read from syslog to DB. |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
310 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
311 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
312 |
dhcp_item = self.filter.parse(item['msg']) |
77
05d6cfa9efac
fix pvl.verkko-dhcp + pvl.syslog.fifo
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
313 |
|
05d6cfa9efac
fix pvl.verkko-dhcp + pvl.syslog.fifo
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
314 |
log.debug("%s: %s", item, dhcp_item) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
315 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
316 |
if not dhcp_item : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
317 |
# ignore |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
318 |
return |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
319 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
320 |
dhcp_item['timestamp'] = item['timestamp'] # XXX: fixup DHCPSyslogParser? |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
321 |
|
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
322 |
if item.get('error') : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
323 |
item['error'] = self.filter.parse_error(item['error']) |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
324 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
325 |
self.hostdb.process(dhcp_item) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
326 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
327 |
def process_leases (self, leases) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
328 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
329 |
Handle given changed lease. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
330 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
331 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
332 |
for lease in leases : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
333 |
log.info("%s", lease['lease']) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
334 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
335 |
self.leasedb.process(lease) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
336 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
337 |
def sync_leases (self, leases) : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
338 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
339 |
Sync the entire given set of valid leases. |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
340 |
""" |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
341 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
342 |
log.info("%d leases", len(leases)) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
343 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
344 |
# XXX: any difference? Mostly removed leases, but... they should expire by themselves, right? |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
345 |
self.process_leases(leases) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
346 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
347 |
def main (self, poll) : |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
348 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
349 |
Read items from syslog source with given polling style. |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
350 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
351 |
TODO: poll = false on SIGINT |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
352 |
""" |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
353 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
354 |
# mainloop |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
355 |
while True : |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
356 |
if self.syslog : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
357 |
# process from source |
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
358 |
for item in self.syslog : |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
359 |
self.process_syslog(item) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
360 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
361 |
if self.leases : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
362 |
# process internally |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
363 |
#sync, leases = self.leases.process() |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
364 |
leases = self.leases.process() |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
365 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
366 |
#if sync : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
367 |
# self.sync_leases(leases) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
368 |
if leases : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
369 |
self.process_leases(leases) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
370 |
#else : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
371 |
# pass |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
372 |
|
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
373 |
if not poll : |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
374 |
# done |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
375 |
break |
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
376 |
|
34
491f7da9d29b
pvl.verkko-dhcp: fix polling without syslog; README
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
377 |
elif self.syslog : |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
378 |
# wait |
18 | 379 |
self.syslog.poll(poll) |
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
380 |
|
34
491f7da9d29b
pvl.verkko-dhcp: fix polling without syslog; README
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
381 |
else : |
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
382 |
# XXX: for --leases-tail |
34
491f7da9d29b
pvl.verkko-dhcp: fix polling without syslog; README
Tero Marttila <terom@paivola.fi>
parents:
18
diff
changeset
|
383 |
time.sleep(poll) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
384 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
385 |
log.debug("tick") |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
386 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
387 |
def main (argv) : |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
388 |
options, args = parse_options(argv) |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
389 |
|
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
390 |
# db |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
391 |
if not options.database : |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
392 |
log.error("No database given") |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
393 |
return 1 |
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
394 |
|
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
395 |
log.info("Open up database: %s", options.database) |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
396 |
database = pvl.verkko.db.Database(options.database) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
397 |
|
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
398 |
# syslog |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
399 |
log.info("Open up syslog...") |
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
400 |
syslog = pvl.syslog.args.apply(options, optional=True) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
401 |
|
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
402 |
if syslog : |
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
403 |
poll = syslog._poll |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
404 |
else : |
16
51509b5ce1c0
request per session, move to postgres, rename columns, fixup state/name/error handling in updates
Tero Marttila <terom@paivola.fi>
parents:
15
diff
changeset
|
405 |
log.warning("No syslog source given") |
64
f5f767bf4887
pvl.verkko-dhcp: updated pvl.syslog, untested
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
406 |
poll = None |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
407 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
408 |
# leases |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
409 |
if options.leases_file : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
410 |
log.info("Open up DHCP leases...") |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
411 |
leases = pvl.verkko.dhcp.leases.DHCPLeasesDatabase(options.leases_file) |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
412 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
413 |
# force polling interval |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
414 |
if options.leases_tail : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
415 |
# XXX: min between syslog/leases? |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
416 |
poll = options.leases_tail |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
417 |
|
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
418 |
else : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
419 |
leases = None |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
420 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
421 |
# handler + main |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
422 |
handler = DHCPHandler(database, syslog, leases) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
423 |
|
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
424 |
if options.create : |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
425 |
handler.createdb() |
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
426 |
|
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
427 |
log.info("Enter mainloop...") |
17
29f0cf9220e0
track dhcp leases, using pvl.verkko.dhcp.leases from pvl-collectd..
Tero Marttila <terom@paivola.fi>
parents:
16
diff
changeset
|
428 |
handler.main(poll) |
15
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
429 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
430 |
# done |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
431 |
return 0 |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
432 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
433 |
if __name__ == '__main__': |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
434 |
import sys |
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
435 |
|
66f81f4b6aa7
bin/pvl.verkko-dhcp: re-implement syslog -> database based on pvl.collectd-dhcp; uses pvl.syslog from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
436 |
sys.exit(main(sys.argv)) |