add process filters system.process metricset (#1665)

elastic · May 19, 2016 · 2de160c · 2de160c
1 parent 234c177
commit 2de160c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 1 deletion.
diff --git a/metricbeat/docs/modules/system.asciidoc b/metricbeat/docs/modules/system.asciidoc
@@ -19,6 +19,7 @@ metricbeat.modules:
     metricsets: ["cpu", "cores", "filesystem", "fsstats", "memory", "process"]
     enabled: true
     period: 2s
+    processes: ['.*']
 ----
 
 === MetricSets

diff --git a/metricbeat/etc/beat.short.yml b/metricbeat/etc/beat.short.yml
@@ -53,5 +53,6 @@ metricbeat.modules:
   metricsets: ["cpu", "cores", "filesystem", "fsstats", "memory", "process"]
   enabled: true
   period: 2s
+  processes: ['.*']
 
 
diff --git a/metricbeat/etc/beat.yml b/metricbeat/etc/beat.yml
@@ -96,6 +96,7 @@ metricbeat.modules:
   metricsets: ["cpu", "cores", "filesystem", "fsstats", "memory", "process"]
   enabled: true
   period: 2s
+  processes: ['.*']
 
 #-------------------------- Zookeeper Status Module --------------------------
 - module: zookeeper

diff --git a/metricbeat/metricbeat.short.yml b/metricbeat/metricbeat.short.yml
@@ -53,6 +53,7 @@ metricbeat.modules:
   metricsets: ["cpu", "cores", "filesystem", "fsstats", "memory", "process"]
   enabled: true
   period: 2s
+  processes: ['.*']
 
 
 

diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml
@@ -96,6 +96,7 @@ metricbeat.modules:
   metricsets: ["cpu", "cores", "filesystem", "fsstats", "memory", "process"]
   enabled: true
   period: 2s
+  processes: ['.*']
 
 #-------------------------- Zookeeper Status Module --------------------------
 - module: zookeeper

diff --git a/metricbeat/module/system/_beat/config.yml b/metricbeat/module/system/_beat/config.yml
@@ -2,3 +2,4 @@
   metricsets: ["cpu", "cores", "filesystem", "fsstats", "memory", "process"]
   enabled: true
   period: 2s
+  processes: ['.*']
diff --git a/metricbeat/module/system/process/process.go b/metricbeat/module/system/process/process.go
@@ -24,11 +24,21 @@ type MetricSet struct {
 
 // New creates and returns a new MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
+	config := struct {
+		Procs []string `config:"processes"` // collect all processes by default
+	}{
+		Procs: []string{".*"},
+	}
+
+	if err := base.Module().UnpackConfig(&config); err != nil {
+		return nil, err
+	}
+
 	m := &MetricSet{
 		BaseMetricSet: base,
 		stats: &system.ProcStats{
 			ProcStats: true,
-			Procs:     []string{".*"}, // Collect all processes.
+			Procs:     config.Procs,
 		},
 	}
 	err := m.stats.InitProcStats()