From 414f96a2431e1a61412c2c5b4533fbcbb53499f6 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 Jan 2013 02:01:17 +0000 Subject: fix graph generation --- retiolum/scripts/adv_graphgen/all_the_graphs.sh | 3 ++- retiolum/scripts/adv_graphgen/anonytize.sh | 2 +- retiolum/scripts/adv_graphgen/sanitize.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'retiolum/scripts/adv_graphgen') diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 8aa0ab21..d3ce8f86 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -4,7 +4,8 @@ echo "`date` begin all graphs" >> /tmp/build_graph cd $(dirname $(readlink -f $0)) PATH=$PATH:../../../util/bin/ - export LOG_FILE=/var/log/retiolum.log + export LOG_FILE=/var/log/syslog + export TINC_LEGACY=true EXTERNAL_FOLDER=/var/www/euer.krebsco.de/graphs/retiolum INTERNAL_FOLDER=/var/www/euer/graphs/retiolum begin=`timer` diff --git a/retiolum/scripts/adv_graphgen/anonytize.sh b/retiolum/scripts/adv_graphgen/anonytize.sh index dec6e456..b31f4dbb 100755 --- a/retiolum/scripts/adv_graphgen/anonytize.sh +++ b/retiolum/scripts/adv_graphgen/anonytize.sh @@ -11,7 +11,7 @@ TYPE2=png OPENER=/bin/true DOTFILE=`mktemp` trap 'rm $DOTFILE' INT TERM -sudo LOG_FILE=$LOG_FILE python ../../tinc_stats2json |\ +sudo -E python tinc_stats2json |\ python parse_tinc_anon.py> $DOTFILE diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 78d74ce6..45d29a22 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -11,7 +11,7 @@ TYPE2=png OPENER=/bin/true DOTFILE=`mktemp` trap 'rm $DOTFILE' INT TERM -sudo LOG_FILE=$LOG_FILE python ../../tinc_stats2json |\ +sudo -E python tinc_stats2json |\ python parse_tinc_stats.py > $DOTFILE -- cgit v1.2.3 From 29d8a4e5061d66d0dfeda28a9012992c12a83ccd Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 6 Jan 2013 04:40:20 +0000 Subject: adv_graphgen: add visual warning for nodes with only one connection as this means no redundancy is configured in case the other connected node dies away --- retiolum/scripts/adv_graphgen/parse_tinc_stats.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'retiolum/scripts/adv_graphgen') diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py index 8371ad3d..03a20214 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py @@ -18,12 +18,12 @@ except Exception as e: sys.stderr.write("Cannot connect to graphite: %s\n" % str(e)) supernodes= [ ] -#supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ] for supernode,addr in check_super(): supernodes.append(supernode) """ TODO: Refactoring needed to pull the edges out of the node structures again, it should be easier to handle both structures""" DUMP_FILE = "/krebs/db/availability" + def write_digraph(nodes): """ writes the complete digraph in dot format @@ -173,6 +173,9 @@ def write_node(k,v): node +="\"" if k in supernodes: node += ",fillcolor=steelblue1" + # warning if node only has one connection + elif v['num_conns'] == 1: + node += ",fillcolor=red" #node +=",group=\""+v['external-ip'].replace(".","")+"\"" node += "]" print node -- cgit v1.2.3