From e0ec5d2e8560ae433ee677622b24ba82dbe7630b Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 29 May 2011 15:47:21 +0200 Subject: lowered filesystem hierarchy--everything are modules --- retiolum/scripts/adv_graphgen/sanitize.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 retiolum/scripts/adv_graphgen/sanitize.sh (limited to 'retiolum/scripts/adv_graphgen/sanitize.sh') diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh new file mode 100755 index 00000000..0e12d207 --- /dev/null +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -0,0 +1,13 @@ +GRAPH_SETTER1=dot +GRAPH_SETTER2=circo +LOG_FILE=/var/log/everything.log +OPENER=/bin/true + +sudo pkill -USR2 tincd +sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ + ./parse.py > retiolum.dot + +$GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot +$GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot +$OPENER retiolum_1.png &>/dev/null +#rm retiolum.dot -- cgit v1.2.3 From 8f3a8ad37da0d683a851a11fe6b55d0a45403b5c Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Mon, 30 May 2011 18:12:42 +0200 Subject: added overlap=false fix, neato grapher --- retiolum/scripts/adv_graphgen/sanitize.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'retiolum/scripts/adv_graphgen/sanitize.sh') diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 0e12d207..3860a9b8 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,5 +1,6 @@ GRAPH_SETTER1=dot GRAPH_SETTER2=circo +GRAPH_SETTER3=neato LOG_FILE=/var/log/everything.log OPENER=/bin/true @@ -9,5 +10,6 @@ sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ $GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot $GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot +$GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot $OPENER retiolum_1.png &>/dev/null #rm retiolum.dot -- cgit v1.2.3 From e89ede8ec7e8893c6fe23f456fbc4de4ab04804c Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Wed, 8 Jun 2011 18:36:33 +0200 Subject: adv_graphgen/sanitize.sh: added sfdp graph setter --- retiolum/scripts/adv_graphgen/sanitize.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'retiolum/scripts/adv_graphgen/sanitize.sh') diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 3860a9b8..2febc54c 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,6 +1,7 @@ GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3=neato +GRAPH_SETTER3=sfdp LOG_FILE=/var/log/everything.log OPENER=/bin/true @@ -11,5 +12,6 @@ sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ $GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot $GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot $GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot +$GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot $OPENER retiolum_1.png &>/dev/null #rm retiolum.dot -- cgit v1.2.3 From 02824eed4f957e25bf9bfda6bf09e093447abb68 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 8 Aug 2011 23:36:42 +0200 Subject: retiolum/scripts/adv_graphgen: verb krebs output retiolum/scripts/adv_graphgen/parse.py: add the group info to the krebs parser retiolum/scripts/adv_graphgen/sanitize.sh: fixed bug which prevents generation of 4 graph new graph setter at retiolum_4.png --- retiolum/scripts/adv_graphgen/sanitize.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'retiolum/scripts/adv_graphgen/sanitize.sh') diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 2febc54c..c0d4e52e 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,7 +1,7 @@ GRAPH_SETTER1=dot GRAPH_SETTER2=circo -GRAPH_SETTER3=neato -GRAPH_SETTER3=sfdp +GRAPH_SETTER3='neato -Goverlap=prism ' +GRAPH_SETTER4=sfdp LOG_FILE=/var/log/everything.log OPENER=/bin/true @@ -13,5 +13,6 @@ $GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot $GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot $GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot $GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot +sfdp -Goverlap=prism retiolum.dot | gvmap -e retiolum.dot | neato -n2 -Tpng -o $!retiolum_6.png $OPENER retiolum_1.png &>/dev/null #rm retiolum.dot -- cgit v1.2.3 From efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 26 Aug 2011 11:48:02 +0200 Subject: adv_graphgen: add HERE variable to launch from every dir --- retiolum/scripts/adv_graphgen/sanitize.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'retiolum/scripts/adv_graphgen/sanitize.sh') diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 38281fba..df6216fa 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,17 +1,19 @@ +#!/bin/sh +HERE=$(dirname `readlink -f $0`) GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' GRAPH_SETTER4=sfdp -LOG_FILE=/var/log/everything.log +LOG_FILE=/var/log/syslog OPENER=/bin/true sudo pkill -USR2 tincd sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ - ./parse.py > retiolum.dot + $HERE/parse.py > $HERE/retiolum.dot -$GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot -$GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot -$GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot -$GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot -$OPENER retiolum_1.png &>/dev/null -rm retiolum.dot +$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $HERE/retiolum.dot +$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $HERE/retiolum.dot +$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $HERE/retiolum.dot +$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $HERE/retiolum.dot +$OPENER $HERE/retiolum_1.png &>/dev/null +rm $HERE/retiolum.dot -- cgit v1.2.3 From 9a7a3afcb949ebe807965d154c00836c462177ff Mon Sep 17 00:00:00 2001 From: EUcancER Date: Thu, 1 Sep 2011 11:00:15 +0200 Subject: adv_graphgen: fix sanitize and parse sanitze.sh now creates dot file in temp directory parse now correctly creates group attribute --- retiolum/scripts/adv_graphgen/sanitize.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'retiolum/scripts/adv_graphgen/sanitize.sh') diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index df6216fa..1dc43bf4 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,5 +1,6 @@ #!/bin/sh HERE=$(dirname `readlink -f $0`) +TMP=/tmp GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' @@ -9,11 +10,11 @@ OPENER=/bin/true sudo pkill -USR2 tincd sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ - $HERE/parse.py > $HERE/retiolum.dot + $HERE/parse.py > $TMP/retiolum.dot -$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $HERE/retiolum.dot -$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $HERE/retiolum.dot -$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $HERE/retiolum.dot -$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $HERE/retiolum.dot +$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $TMP/retiolum.dot +$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $TMP/retiolum.dot +$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $TMP/retiolum.dot +$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $TMP/retiolum.dot $OPENER $HERE/retiolum_1.png &>/dev/null -rm $HERE/retiolum.dot +rm $TMP/retiolum.dot -- cgit v1.2.3