test

Author: stefans-elastic

x-pack/metricbeat/module/iis/application_pool/_meta/fields.yml

@@ -136,3 +136,5 @@
               type: float
               description: >
                 Current Queue Length.
+        - name: "state"
+          type: long

x-pack/metricbeat/module/iis/application_pool/reader.go

@@ -80,7 +80,7 @@ var appPoolCounters = map[string]string{
 	"net_clr.locks_and_threads.contention_rate_per_sec": "\\.NET CLR LocksAndThreads(w3wp*)\\Contention Rate / sec",
 	"net_clr.locks_and_threads.current_queue_length":    "\\.NET CLR LocksAndThreads(w3wp*)\\Current Queue Length",
 
-	"test_state": "\\APP_POOL_WAS(*)\\Current Application Pool State",
+	"state": "\\APP_POOL_WAS(*)\\Current Application Pool State",
 }
 
 // newReader creates a new instance of Reader.
@@ -172,10 +172,10 @@ func (r *Reader) initAppPools() error {
 
 // read executes a query and returns those values in an event.
 func (r *Reader) read() ([]mb.Event, error) {
-	// if len(r.applicationPools) == 0 {
-	// 	r.executed = true
-	// 	return nil, nil
-	// }
+	if len(r.applicationPools) == 0 {
+		r.executed = true
+		return nil, nil
+	}
 
 	// Some counters, such as rate counters, require two counter values in order to compute a displayable value. In this case we must call PdhCollectQueryData twice before calling PdhGetFormattedCounterValue.
 	// For more information, see Collecting Performance Data (https://docs.microsoft.com/en-us/windows/desktop/PerfCtrs/collecting-performance-data).
@@ -200,7 +200,7 @@ func (r *Reader) read() ([]mb.Event, error) {
 }
 
 func (r *Reader) mapEvents(values map[string][]pdh.CounterValue) map[string]mb.Event {
-	// workers := getProcessIds(values)
+	workers := getProcessIds(values)
 	events := make(map[string]mb.Event)
 	for _, appPool := range r.applicationPools {
 		events[appPool.name] = mb.Event{
@@ -227,13 +227,13 @@ func (r *Reader) mapEvents(values map[string][]pdh.CounterValue) map[string]mb.E
 						continue
 					}
 				}
-				// if hasWorkerProcess(val.Instance, workers, appPool.workerProcessIds) {
-				if r.workerProcesses[counterPath] == ecsProcessId {
-					events[appPool.name].RootFields.Put(r.workerProcesses[counterPath], val.Measurement)
-				} else if len(r.workerProcesses[counterPath]) != 0 {
-					events[appPool.name].MetricSetFields.Put(r.workerProcesses[counterPath], val.Measurement)
+				if hasWorkerProcess(val.Instance, workers, appPool.workerProcessIds) || val.Instance == appPool.name {
+					if r.workerProcesses[counterPath] == ecsProcessId {
+						events[appPool.name].RootFields.Put(r.workerProcesses[counterPath], val.Measurement)
+					} else if len(r.workerProcesses[counterPath]) != 0 {
+						events[appPool.name].MetricSetFields.Put(r.workerProcesses[counterPath], val.Measurement)
+					}
 				}
-				// }
 			}
 		}
 	}