Merge branch 'master' of github.com:krebscode/painload

4 files changed, 121 insertions, 18 deletions

diff --git a/cholerab/Gewaltenteilung/deps.txt b/cholerab/Gewaltenteilung/deps.txt
new file mode 100644
index 00000000..8eadcdd8
--- /dev/null
+++ b/cholerab/Gewaltenteilung/deps.txt
@@ -0,0 +1,4 @@
+core      retiolum Reaktor
+retiolum
+Reaktor   retiolum
+noise     core
diff --git a/cholerab/thesauron b/cholerab/thesauron
index 21fa1cf9..0c7f7e31 100644
--- a/cholerab/thesauron
+++ b/cholerab/thesauron
@@ -6,6 +6,12 @@ Cholerab n.
   Zusammenarbeit niemals gut, einfach und ohne Schmerzen funktioniert.
 - Teamwork-Plattform für Krebscode.
 
+eigentlich, adv.
+[de]
+- Hinweis darauf, dass der Inhalt eines Satzes eine Soll-Realität beschreibt,
+  die nicht der Fall ist.
+Antonym: tatsaechlich
+
 KD;RP abbr. (pronounciation: kah-derp)
 [en]
 - Short for Krebs Darknet / Retiolum Prefix.
@@ -48,6 +54,11 @@ Sanatorium n.
 - An Retiolum-based IRC-channel where all Reaktor-enabled nodes gather
   and lurk for relevant input.
 
+tatsaechlich, adv.
+[de]
+- Hinweis darauf, dass der Inhalt eines Satzes exakt der Realität entspricht.
+Antonym: eigentlich
+
 Verkrebsung n.
 [de]
 - Synonym fuer die Installation von Krebs (oder eine einzelnen Krebs 
diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py
index aae69f0f..e99a5573 100755
--- a/retiolum/scripts/adv_graphgen/parse.py
+++ b/retiolum/scripts/adv_graphgen/parse.py
@@ -1,28 +1,96 @@
 #!/usr/bin/python
 # -*- coding: utf8 -*-
 
-import sys
+import sys,json
+supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ]
 """ 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
   """
   print ('digraph retiolum {')
+  #print ('  graph [center rankdir=LR packMode="clust"]')
+  print ('  graph [center packMode="clust"]')
   print ('  node[shape=box,style=filled,fillcolor=grey]')
   print ('  overlap=false')
   generate_stats(nodes)
-  nodes = delete_unused_nodes(nodes)
   merge_edges(nodes)
+  write_stat_node(nodes)
   for k,v in nodes.iteritems():
     write_node(k,v)
   print ('}')
+def dump_graph(nodes):
+  from time import time
+  graph = {}
+  graph['nodes'] = nodes
+  graph['timestamp'] = time()
+  f = open(DUMP_FILE,'a')
+  json.dump(graph,f)
+  f.write('\n')
+  f.close()
+def write_stat_node(nodes):
+  ''' Write a `stats` node in the corner
+      This node contains infos about the current number of active nodes and connections inside the network
+  '''
+  num_conns = 0
+  num_nodes = len(nodes)
+  for k,v in nodes.iteritems():
+    num_conns+= len(v['to'])
+  node_text = "  stats_node [label=\"Statistics\\l"
+  node_text += "Active Nodes: %s\\l" % num_nodes
+  node_text += "Connections : %s\\l" % num_conns
+  node_text += "\""
+  node_text += ",fillcolor=green"
+  node_text += "]"
+  print(node_text)
+
 def generate_stats(nodes):
   """ Generates some statistics of the network and nodes
   """
+  f = open(DUMP_FILE,'r')
+  jlines = []
+  for line in f:
+    jlines.append(json.loads(line))
+  f.close()
   for k,v in nodes.iteritems():
-    v['num_conns'] = len(v.get('to',[]))
+    conns = v.get('to',[])
+    v['num_conns'] = len(conns)
+    v['avg_weight'] = get_node_avg_weight(conns)
+    v['availability'] = get_node_availability(k,jlines)
+    sys.stderr.write( "%s -> %f\n" %(k ,v['availability']))
+def get_node_avg_weight(conns):
+  """ calculates the average weight for the given connections """
+  if not conns:
+    sys.syderr.write("get_node_avg_weight: connection parameter empty")
+    return 9001
+  else:
+    return sum([float(c['weight']) for c in conns])/len(conns)
+def get_node_availability(name,jlines):
+  """ calculates the node availability by reading the generated dump file
+  adding together the uptime of the node and returning the time
+	parms:
+          name - node name
+          jlines - list of already parsed dictionaries node archive
+  """
+  begin = last = current = 0
+  uptime = 0
+  #sys.stderr.write ( "Getting Node availability of %s\n" % name)
+  for stat in jlines:
+    ts = stat['timestamp']
+    if not begin:
+      begin = last = ts
+    current = ts
+    if stat['nodes'].get(name,{}).get('to',[]):
+      uptime += current - last
+    else:
+      pass
+      #sys.stderr.write("%s offline at timestamp %f\n" %(name,current))
+    last = ts
+  all_the_time = last - begin
+  return uptime/ all_the_time
+
 def delete_unused_nodes(nodes):
   new_nodes = {}
   for k,v in nodes.iteritems():
@@ -38,7 +106,6 @@ def delete_unused_nodes(nodes):
 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',[]):
@@ -56,20 +123,34 @@ def write_node(k,v):
 
   node = "  "+k+"[label=\""
   node += k+"\\l"
-  node += "external:"+v['external-ip']+":"+v['external-port']+"\\l"
+  node += "availability: %f\\l" % v['availability'] 
+  node += "avg weight: %.2f\\l" % v['avg_weight'] 
   if v.has_key('num_conns'):
     node += "Num Connects:"+str(v['num_conns'])+"\\l"
+  node += "external:"+v['external-ip']+":"+v['external-port']+"\\l"
   for addr in v.get('internal-ip',['¯\\\\(°_o)/¯']):
     node += "internal:"+addr+"\\l"
   node +="\""
-  if v['external-ip'] == "MYSELF":
+  if k in supernodes:
     node += ",fillcolor=steelblue1"
-  node +=",group=\""+v['external-ip'].replace(".","")+"\""
+  #node +=",group=\""+v['external-ip'].replace(".","")+"\""
   node += "]"
   print node
 
   for con in v.get('to',[]):
-    edge = "  "+k+ " -> " +con['name'] + "[weight="+str(float(con['weight']))
+    label  = con['weight']
+    w = int(con['weight'])
+    weight = str(1000 - (((w - 150) * (1000 - 0)) / (1000 -150 )) + 0)
+
+    length = str(float(w)/1500)
+    #weight = "1000" #str(300/float(con['weight']))
+    #weight = str((100/float(con['weight'])))
+    #weight = str(-1 * (200-100000/int(con['weight'])))
+    if float(weight) < 0 :
+      weight= "1"
+
+    #sys.stderr.write(weight + ":"+ length +" %s -> " %k + str(con) + "\n")
+    edge = "  "+k+ " -> " +con['name'] + "[label="+label + " weight="+weight #+ " minlen="+length
     if con.get('bidirectional',False):
       edge += ",dir=both"
     edge += "]"
@@ -107,4 +188,6 @@ def parse_input():
             {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] })
   return nodes
 nodes = parse_input()
+nodes = delete_unused_nodes(nodes)
+dump_graph(nodes)
 write_digraph(nodes)
diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh
index 1dc43bf4..3fddb605 100755
--- a/retiolum/scripts/adv_graphgen/sanitize.sh
+++ b/retiolum/scripts/adv_graphgen/sanitize.sh
@@ -1,20 +1,25 @@
 #!/bin/sh
 HERE=$(dirname `readlink -f $0`)
-TMP=/tmp
 GRAPH_SETTER1=dot
 GRAPH_SETTER2=circo
 GRAPH_SETTER3='neato -Goverlap=prism '
 GRAPH_SETTER4=sfdp
 LOG_FILE=/var/log/syslog
+TYPE=svg
+TYPE2=png
 OPENER=/bin/true
-
+DOTFILE=`mktemp`
+trap 'rm $DOTFILE' SIGINT SIGTERM
 sudo pkill -USR2 tincd
 sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\
-    $HERE/parse.py > $TMP/retiolum.dot
+    $HERE/parse.py > $DOTFILE
 
-$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 $TMP/retiolum.dot
+$GRAPH_SETTER1 -T$TYPE -o $1/retiolum_1.$TYPE $DOTFILE
+$GRAPH_SETTER2 -T$TYPE -o $1/retiolum_2.$TYPE $DOTFILE
+$GRAPH_SETTER3 -T$TYPE -o $1/retiolum_3.$TYPE $DOTFILE
+$GRAPH_SETTER4 -T$TYPE -o $1/retiolum_4.$TYPE $DOTFILE
+#convert -resize 20% $1/retiolum_1.$TYPE  $1/retiolum_1.$TYPE2
+#convert -resize 20% $1/retiolum_2.$TYPE  $1/retiolum_2.$TYPE2
+#convert -resize 20% $1/retiolum_3.$TYPE  $1/retiolum_3.$TYPE2
+#convert -resize 20% $1/retiolum_4.$TYPE  $1/retiolum_4.$TYPE2
+#$OPENER $1/retiolum_1.$TYPE &>/dev/null