collector: collect process info only when needed (#45)

* collector: collect process info only when needed

* collector: add comment to describe collector argument choices

* update vendors

* collector: remove empty results from JSON

* collector/tools: optimize on option parsing

Author: AstroProfundis

Gopkg.lock

@@ -38,22 +38,23 @@ type Meta struct {
 
 type Metrics struct {
 	Meta       Meta            `json:"meta"`
-	SysInfo    sysinfo.SysInfo `json:"sysinfo"`
-	NTP        TimeStat        `json:"ntp"`
-	Partitions []BlockDev      `json:"partitions"`
-	ProcStats  []ProcessStat   `json:"proc_stats"`
+	SysInfo    sysinfo.SysInfo `json:"sysinfo,omitempty"`
+	NTP        TimeStat        `json:"ntp,omitempty"`
+	Partitions []BlockDev      `json:"partitions,omitempty"`
+	ProcStats  []ProcessStat   `json:"proc_stats,omitempty"`
 }
 
 type options struct {
-	Pid string
+	Pid  string
+	Proc bool
 }
 
 func parseOpts() options {
 	optPid := flag.String("pid", "", "The PID of process to collect info. Multiple PIDs can be seperatted by ','.")
+	optProc := flag.Bool("proc", false, "Only collect process info, disabled (Collect everything except process info) by default.")
 	flag.Parse()
 
-	var opts options
-	opts.Pid = *optPid
+	opts := options{*optPid, *optProc}
 	return opts
 }
 
@@ -73,10 +74,13 @@ func main() {
 
 func (metric *Metrics) getMetrics(opts options) {
 	metric.Meta.getMeta()
-	metric.SysInfo.GetSysInfo()
-	metric.NTP.getNTPInfo()
-	metric.Partitions = GetPartitionStats()
-	metric.ProcStats = GetProcStats(opts.Pid)
+	if opts.Proc {
+		metric.ProcStats = GetProcStats(opts.Pid)
+	} else {
+		metric.SysInfo.GetSysInfo()
+		metric.NTP.getNTPInfo()
+		metric.Partitions = GetPartitionStats()
+	}
 }
 
 func (meta *Meta) getMeta() {

collector/collector.go

@@ -95,13 +95,14 @@ def collector(self, args):
         if args.pid:
             logging.debug(
                 "Collecting process infor only for PID %s" % args.pid)
-            collector_exec = [collector_exec, '-pid', '%s' % args.pid]
+            collector_exec = [collector_exec, '-proc', '-pid', '%s' % args.pid]
         elif args.port:
             protocol = 'UDP' if args.udp else 'TCP'
             pids = ','.join(
                 str(_pid) for _pid in proc_meta.find_process_by_port(args.port, protocol))
             logging.debug("Collecting process infor for PIDs %s" % pids)
-            collector_exec = [collector_exec, '-pid', '%s' % pids]
+            collector_exec = [collector_exec, '-proc', '-pid', '%s' % pids]
+        # else call collector without any argument
 
         stdout, stderr = util.run_cmd(collector_exec)
         if stderr:
@@ -114,6 +115,13 @@ def collector(self, args):
 
         # save various info to seperate .json files
         for k, v in self.collector_data.items():
+            # This is a dirty hack to omit empty results, until Go fix that upstream,
+            # see: https://github.com/golang/go/issues/11939
+            if (args.pid or args.port) and k in ['sysinfo', 'ntp']:
+                continue
+            if not v or len(v) < 1:
+                logging.debug("Skipped empty result %s:%s" % (k, v))
+                continue
             fileopt.write_file(os.path.join(collector_outdir, "%s.json" % k),
                                json.dumps(v, indent=2))
 

insight.py

@@ -44,14 +44,8 @@ func parseOpts() options {
 	influxChunk := flag.Int("chunk", 2000, "The chunk size of writing.")
 	flag.Parse()
 
-	var opts options
-	opts.Host = *influxHost
-	opts.Port = *influxPort
-	opts.User = *influxUser
-	opts.Passwd = *influxPass
-	opts.DBName = *influxDB
-	opts.File = *influxFile
-	opts.Chunk = *influxChunk
+	opts := options{*influxHost, *influxPort, *influxUser, *influxPass,
+		*influxDB, *influxFile, *influxChunk}
 	return opts
 }