From eaf462c44f518227091a4c2b616d2ba122288d23 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Wed, 11 May 2011 12:38:40 +0200 Subject: added tinc syslog parser and graph generator parse.py: parses syslog input given via stdin, writes graphviz graph to stdout sanitize.sh:helper script which prepares syslog for the parse script,pipes output of parse.sh into graphviz --- hosts/.scripts/parse.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++ hosts/.scripts/sanitize.sh | 2 ++ 2 files changed, 55 insertions(+) create mode 100755 hosts/.scripts/parse.py create mode 100755 hosts/.scripts/sanitize.sh (limited to 'hosts/.scripts') diff --git a/hosts/.scripts/parse.py b/hosts/.scripts/parse.py new file mode 100755 index 00000000..a7ca7884 --- /dev/null +++ b/hosts/.scripts/parse.py @@ -0,0 +1,53 @@ +#!/usr/bin/python2 + +import sys + +def write_digraph(nodes): + print ('digraph retiolum {') + print (' node[shape=box,style=filled,fillcolor=grey]') + for k,v in nodes.iteritems(): + write_node(k,v) + print ('}') +def write_node(k,v): + node = " "+k+"[label=\"" + node += k+"\\l" + node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" + node += "internal:"+v['internal-ip']+"\\l\"" + if v['external-ip'] == "MYSELF": + sys.stderr.write("lolwut") + node += ",fillcolor=steelblue1" + node += "]" + print (node) + for con in v.get('to',[]): + print " "+k+ "->" +con['name'] + "[weight="+str(10/float(con['weight']))+"]" +nodes={} +edges={} + +for line in sys.stdin: + line = line.replace('\n','') + if line == 'Nodes:': + nodes={} + for line in sys.stdin: + if line == 'End of nodes.\n': + break + l = line.replace('\n','').split() #TODO unhack me + nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] } + if line == 'Subnet list:': + for line in sys.stdin: + if line == 'End of subnet list.\n': + break + l = line.replace('\n','').split() + nodes[l[2]]['internal-ip'] = l[0].split('#')[0] + if line == 'Edges:': + edges = {} + for line in sys.stdin: + if line == 'End of edges.\n': + break + l = line.replace('\n','').split() + + if not nodes[l[0]].has_key('to') : + nodes[l[0]]['to'] = [] + nodes[l[0]]['to'].append( + {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] }) + +write_digraph(nodes) diff --git a/hosts/.scripts/sanitize.sh b/hosts/.scripts/sanitize.sh new file mode 100755 index 00000000..92a7b6ee --- /dev/null +++ b/hosts/.scripts/sanitize.sh @@ -0,0 +1,2 @@ +sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee here.dot | dot | gvcolor | dot -Tpng -O +mirage noname.dot.png -- cgit v1.2.3 From b0fc672487146b806c502c8118ef4ea45a5671bd Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Wed, 11 May 2011 13:17:21 +0200 Subject: refactored parser script,fixed bug parse.py: refactored parsing into function sanitize.sh: fixed bug which creates race condition, removed gvcolor from toolchain --- hosts/.scripts/parse.py | 58 +++++++++++++++++++++++----------------------- hosts/.scripts/sanitize.sh | 4 ++-- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'hosts/.scripts') diff --git a/hosts/.scripts/parse.py b/hosts/.scripts/parse.py index a7ca7884..951fce94 100755 --- a/hosts/.scripts/parse.py +++ b/hosts/.scripts/parse.py @@ -14,40 +14,40 @@ def write_node(k,v): node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" node += "internal:"+v['internal-ip']+"\\l\"" if v['external-ip'] == "MYSELF": - sys.stderr.write("lolwut") node += ",fillcolor=steelblue1" node += "]" print (node) for con in v.get('to',[]): print " "+k+ "->" +con['name'] + "[weight="+str(10/float(con['weight']))+"]" -nodes={} -edges={} -for line in sys.stdin: - line = line.replace('\n','') - if line == 'Nodes:': - nodes={} - for line in sys.stdin: - if line == 'End of nodes.\n': - break - l = line.replace('\n','').split() #TODO unhack me - nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] } - if line == 'Subnet list:': - for line in sys.stdin: - if line == 'End of subnet list.\n': - break - l = line.replace('\n','').split() - nodes[l[2]]['internal-ip'] = l[0].split('#')[0] - if line == 'Edges:': - edges = {} - for line in sys.stdin: - if line == 'End of edges.\n': - break - l = line.replace('\n','').split() - - if not nodes[l[0]].has_key('to') : - nodes[l[0]]['to'] = [] - nodes[l[0]]['to'].append( - {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] }) +def parse_input(): + nodes={} + for line in sys.stdin: + line = line.replace('\n','') + if line == 'Nodes:': + nodes={} + for line in sys.stdin: + if line == 'End of nodes.\n': + break + l = line.replace('\n','').split() #TODO unhack me + nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] } + if line == 'Subnet list:': + for line in sys.stdin: + if line == 'End of subnet list.\n': + break + l = line.replace('\n','').split() + nodes[l[2]]['internal-ip'] = l[0].split('#')[0] + if line == 'Edges:': + edges = {} + for line in sys.stdin: + if line == 'End of edges.\n': + break + l = line.replace('\n','').split() + if not nodes[l[0]].has_key('to') : + nodes[l[0]]['to'] = [] + nodes[l[0]]['to'].append( + {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] }) + return nodes +nodes = parse_input() write_digraph(nodes) diff --git a/hosts/.scripts/sanitize.sh b/hosts/.scripts/sanitize.sh index 92a7b6ee..75a04af1 100755 --- a/hosts/.scripts/sanitize.sh +++ b/hosts/.scripts/sanitize.sh @@ -1,2 +1,2 @@ -sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee here.dot | dot | gvcolor | dot -Tpng -O -mirage noname.dot.png +sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[1-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee here.dot | dot -Tpng -o retiolum.png +mirage retiolum.png -- cgit v1.2.3 From 591d71a6dc385f3e5bb0b0c25efd22648f57cebb Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Wed, 11 May 2011 13:48:07 +0200 Subject: refactored parse.py parse.py: now also writes the number of current connections --- hosts/.scripts/parse.py | 32 ++++++++++++++++++++++++++++++-- hosts/.scripts/sanitize.sh | 2 +- 2 files changed, 31 insertions(+), 3 deletions(-) (limited to 'hosts/.scripts') diff --git a/hosts/.scripts/parse.py b/hosts/.scripts/parse.py index 951fce94..54f6c35d 100755 --- a/hosts/.scripts/parse.py +++ b/hosts/.scripts/parse.py @@ -1,24 +1,52 @@ #!/usr/bin/python2 import sys +""" TODO: Refactoring needed to pull the edges out of the node structures again, +it should be easier to handle both structures""" def write_digraph(nodes): - print ('digraph retiolum {') + """ + writes the complete digraph in dot format + """ + print ('graph retiolum {') print (' node[shape=box,style=filled,fillcolor=grey]') + generate_stats(nodes) + merge_edges(nodes) for k,v in nodes.iteritems(): write_node(k,v) print ('}') +def generate_stats(nodes): + """ Generates some statistics of the network and nodes + """ + for k,v in nodes.iteritems(): + v['num_conns'] = len(v.get('to',[])) + +def merge_edges(nodes): + """ merge back and forth edges into one + DESTRUCTS the current structure by deleting "connections" in the nodes + + """ + for k,v in nodes.iteritems(): + for con in v.get('to',[]): + for i,secon in enumerate(nodes[con['name']].get('to',[])): + if k == secon['name']: + del (nodes[con['name']]['to'][i]) + + def write_node(k,v): + """ writes a single node and its edges """ node = " "+k+"[label=\"" node += k+"\\l" node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" + if v.has_key('num_conns'): + node += "Num Connects:"+str(v['num_conns'])+"\\l" node += "internal:"+v['internal-ip']+"\\l\"" if v['external-ip'] == "MYSELF": node += ",fillcolor=steelblue1" node += "]" print (node) for con in v.get('to',[]): - print " "+k+ "->" +con['name'] + "[weight="+str(10/float(con['weight']))+"]" + print " "+k+ " -- " +con['name'] + "[weight="+str(10/float(con['weight']))+"]" def parse_input(): nodes={} diff --git a/hosts/.scripts/sanitize.sh b/hosts/.scripts/sanitize.sh index 75a04af1..0342d98b 100755 --- a/hosts/.scripts/sanitize.sh +++ b/hosts/.scripts/sanitize.sh @@ -1,2 +1,2 @@ -sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[1-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee here.dot | dot -Tpng -o retiolum.png +sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[1-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee retiolum.dot | dot -Tpng -o retiolum.png mirage retiolum.png -- cgit v1.2.3 From a035404440927a6a8d5242442bdc1e3661cf9af6 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Wed, 11 May 2011 13:56:53 +0200 Subject: updated sanitize, more generic script sanitize.sh: has two variables, self explanatory, script is now more enterprise by utilizing xdg-open script --- hosts/.scripts/sanitize.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'hosts/.scripts') diff --git a/hosts/.scripts/sanitize.sh b/hosts/.scripts/sanitize.sh index 0342d98b..83f45aef 100755 --- a/hosts/.scripts/sanitize.sh +++ b/hosts/.scripts/sanitize.sh @@ -1,2 +1,8 @@ -sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[1-9]*\]: //gp}' /var/log/everything.log | ./parse.py | tee retiolum.dot | dot -Tpng -o retiolum.png -mirage retiolum.png +GRAPH_SETTER=dot +LOG_FILE=/var/log/everything.log + +sudo pkill -USR2 tincd +sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[1-9]*\]: //gp}' $LOG_FILE |\ + ./parse.py | tee retiolum.dot |\ + $GRAPH_SETTER -Tpng -o retiolum.png +xdg-open retiolum.png -- cgit v1.2.3