Merge branch 'master' into og-autoload

Netdisco/share/config.yml

@@ -119,6 +119,8 @@ arpnip_min_age: 0
 nbtstat_no: []
 nbtstat_only: []
 nbtstat_max_age: 7
+nbtstat_interval: 0.02
+nbtstat_timeout: 1
 expire_devices: 0
 expire_nodes: 0
 expire_nodes_archive: 0
@@ -144,6 +146,7 @@ ignore_interfaces:
 ignore_private_nets: false
 reverse_sysname: false
 vlanctl: true
+portctl_nameonly: false
 portctl_nophones: false
 portctl_vlans: false
 portctl_uplinks: false
@@ -165,7 +168,7 @@ port_control_reasons:
 # --------------
 
 workers:
-  interactives: 2
+  interactives: 1
   pollers: 10
   sleep_time: 2
   queue: PostgreSQL
@@ -210,6 +213,50 @@ job_type_keys:
   Poller: pollers
   Interactive: interactives
 
+# ---------------
+# GraphViz Export
+# ---------------
+
+graph:
+  # ---- Graph Settings ----
+  edge_color      : wheat
+
+  graph           : 'graph/netmap.gif'
+  graph_png       : 'graph/netmap.png'
+  graph_bg        : black
+  graph_clusters  : false  # try fdp layout
+  graph_color     : white
+  graph_default   : png
+  #graph_dir      : net_dir.gif
+  graph_epsilon   : 6
+  graph_layout    : twopi  # try neato or fdp too
+  graph_map       : 'graph/netmap.map'
+  graph_overlap   : scale
+  graph_nodesep   : 2
+  graph_ranksep   : .3
+  graph_raw       : 'graph/graph_raw.dot'
+  graph_splines   : false
+  graph_svg       : 'graph/netmap.svg'
+  graph_timeout   : 90
+  graph_x         : 30
+  graph_y         : 30
+
+  node_fillcolor  : dimgrey
+  node_font       : lucon
+  node_fontsize   : 46.0
+  node_fontcolor  : white
+  node_problem    : red
+  node_shape      : box
+  node_style      : filled
+  #edge_style      : setlinewidth(10)
+
+  # ---- Node Maps ----
+  # variable:matching pattern:node attribute:attribute value:key:key name
+  #node_map:
+  #  - 'label:cat(?!-g):fillcolor:blue:cat:Blue Box - Catalyst Device'
+  #  - 'label:-g:fillcolor:darkgreen:dev-g:Green Box - Gateway / Router'
+  #  - 'ip:^192.168\.:color:yellow:dev:Yellow Border - ResNet'
+
 # ---------------
 # DANCER INTERNAL
 # ---------------