From 336600806256900b428e51c4c975129fb7d401c9 Mon Sep 17 00:00:00 2001
From: root <root@bird.sf.inmon.com>
Date: Thu, 20 Oct 2016 15:26:00 -0700
Subject: [PATCH] improve example hsflowd.conf

---
 hsflowd.spec                   |  2 +-
 src/Linux/scripts/hsflowd.conf | 66 ++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/hsflowd.spec b/hsflowd.spec
index c8d2e3c3..531a22a2 100644
--- a/hsflowd.spec
+++ b/hsflowd.spec
@@ -1,7 +1,7 @@
 Summary: host sFlow daemon
 Name: hsflowd
 Version: 2.0.5
-Release: 6
+Release: 7
 License: http://sflow.net/license.html
 Group: Applications/Internet
 URL: http://sflow.net
diff --git a/src/Linux/scripts/hsflowd.conf b/src/Linux/scripts/hsflowd.conf
index b6dbdf0e..a3ad7b5e 100644
--- a/src/Linux/scripts/hsflowd.conf
+++ b/src/Linux/scripts/hsflowd.conf
@@ -5,51 +5,57 @@ sflow {
   # ======  Agent IP selection ======
   # Selection is automatic, unless:
   # (1) override with preferred CIDR:
-  # agent.cidr = 192.168.0.0/16
+  #   agent.cidr = 192.168.0.0/16
   # (2) Override with interface:
-  # agent = eth0
+  #   agent = eth0
 
   # ====== Sampling/Polling/Collectors ======
-  # EITHER: automatic (with DNS-SD):
-  # DNS-SD { }
-  # OR: manual (when no DNS-SD):
-  # Counter Polling:
-  # polling = 30
-  # default sampling N:
-  # sampling = 400
-  # sampling N on interfaces with ifSpeed:
-  # sampling.100M = 100
-  # sampling.1G = 1000
-  # sampling.10G = 10000
-  # sampling.40G = 40000
-  # collectors:
+  # EITHER: automatic (DNS SRV+TXT from _sflow._udp):
+  #   DNS-SD { }
+  # OR: manual:
+  #   Counter Polling:
+  #     polling = 30
+  #   default sampling N:
+  #     sampling = 400
+  #   sampling N on interfaces with ifSpeed:
+  #     sampling.100M = 100
+  #     sampling.1G = 1000
+  #     sampling.10G = 10000
+  #     sampling.40G = 40000
+  #   sampling N for apache, nginx:
+  #     sampling.http = 50
+  #   sampling N for application (requires json):
+  #     sampling.app.myapp = 100
+  #   collectors:
   collector { ip=127.0.0.1 udpport=6343 }
-  # add additional collectors here
+  #   add additional collectors here
 
   # ====== Local configuration ======
   # listen for JSON-encoded input:
-  # json { UDPport = 36343 }
+  #   json { UDPport = 36343 }
   # PCAP+BPF packet-sampling:
-  # Bridge example:
-  # pcap { dev = docker0 }
-  # NIC example:
-  # pcap { dev = eth0 }
-  # pcap { dev = eth1 }
+  #   Bridge example:
+  #     pcap { dev = docker0 }
+  #   NIC example:
+  #     pcap { dev = eth0 }
+  #     pcap { dev = eth1 }
+  #   All NICs example:
+  #     pcap { speed=1G-1T }
   # NFLOG packet-sampling:
-  # nflog { group = 5  probability = 0.0025 }
+  #   nflog { group = 5  probability = 0.0025 }
   # ULOG packet-sampling:
-  # ulog { group = 1  probability = 0.0025 }
+  #   ulog { group = 1  probability = 0.0025 }
   # Nvidia NVML GPU monitoring:
-  # nvml { }
+  #   nvml { }
   # Xen hypervisor and VM monitoring:
-  # xen { }
+  #   xen { }
   # Open vSwitch sFlow configuration:
-  # ovs { }
+  #   ovs { }
   # KVM (libvirt) hypervisor and VM monitoring:
-  # kvm { }
+  #   kvm { }
   # Docker container monitoring:
-  # docker { }
+  #   docker { }
   # TCP round-trip-time/loss/jitter (requires pcap/nflog/ulog)
-  # tcp { }
+  #   tcp { }
 }