[Metricbeat] Add 'query' metricset for prometheus module

metricbeat/docs/fields.asciidoc

@@ -31595,6 +31595,22 @@ type: object
 
 --
 
+*`prometheus.query.*`*::
++
+--
+Prometheus value resulted from PromQL
+
+
+type: object
+
+--
+
+[float]
+=== query
+
+query metricset
+
+
 [float]
 === remote_write
 

metricbeat/docs/modules/prometheus.asciidoc

@@ -45,6 +45,7 @@ metricbeat.modules:
   #ssl.certificate_authorities:
   #  - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
 
+
 # Metrics sent by a Prometheus server using remote_write option
 - module: prometheus
   metricsets: ["remote_write"]
@@ -54,6 +55,28 @@ metricbeat.modules:
   # Secure settings for the server using TLS/SSL:
   #ssl.certificate: "/etc/pki/server/cert.pem"
   #ssl.key: "/etc/pki/server/cert.key"
+
+
+- module: prometheus
+  period: 10s
+  hosts: ["localhost:9090"]
+  metricsets: ["query"]
+  queries:
+  - query_name: "instant_vector"
+    path: "/api/v1/query"
+    query_params:
+      query: "sum(rate(prometheus_http_requests_total[1m]))"
+  - query_name: "range_vector"
+    path: "/api/v1/query_range"
+    query_params:
+      query: "up"
+      start: "2019-12-20T00:00:00.000Z"
+      end:  "2019-12-21T00:00:00.000Z"
+      step: 1h
+  - query_name: "scalar"
+    path: "/api/v1/query"
+    query_params:
+      query: "100"
 ----
 
 This module supports TLS connections when using `ssl` config field, as described in <<configuration-ssl>>.
@@ -66,9 +89,13 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-prometheus-collector,collector>>
 
+* <<metricbeat-metricset-prometheus-query,query>>
+
 * <<metricbeat-metricset-prometheus-remote_write,remote_write>>
 
 include::prometheus/collector.asciidoc[]
 
+include::prometheus/query.asciidoc[]
+
 include::prometheus/remote_write.asciidoc[]
 

metricbeat/docs/modules/prometheus/query.asciidoc

@@ -0,0 +1,23 @@
+////
+This file is generated! See scripts/mage/docs_collector.go
+////
+
+[[metricbeat-metricset-prometheus-query]]
+=== Prometheus query metricset
+
+beta[]
+
+include::../../../module/prometheus/query/_meta/docs.asciidoc[]
+
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-prometheus,exported fields>> section.
+
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../module/prometheus/query/_meta/data.json[]
+----

metricbeat/docs/modules_list.asciidoc

@@ -205,7 +205,8 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-postgresql-database,database>>   
 |<<metricbeat-metricset-postgresql-statement,statement>>   
 |<<metricbeat-module-prometheus,Prometheus>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.2+| .2+|  |<<metricbeat-metricset-prometheus-collector,collector>>   
+.3+| .3+|  |<<metricbeat-metricset-prometheus-collector,collector>>   
+|<<metricbeat-metricset-prometheus-query,query>> beta[]  
 |<<metricbeat-metricset-prometheus-remote_write,remote_write>> beta[]  
 |<<metricbeat-module-rabbitmq,RabbitMQ>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .4+| .4+|  |<<metricbeat-metricset-rabbitmq-connection,connection>>   

metricbeat/metricbeat.reference.yml

@@ -717,6 +717,7 @@ metricbeat.modules:
   #ssl.certificate_authorities:
   #  - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
 
+
 # Metrics sent by a Prometheus server using remote_write option
 - module: prometheus
   metricsets: ["remote_write"]
@@ -727,6 +728,28 @@ metricbeat.modules:
   #ssl.certificate: "/etc/pki/server/cert.pem"
   #ssl.key: "/etc/pki/server/cert.key"
 
+
+- module: prometheus
+  period: 10s
+  hosts: ["localhost:9090"]
+  metricsets: ["query"]
+  queries:
+  - query_name: "instant_vector"
+    path: "/api/v1/query"
+    query_params:
+      query: "sum(rate(prometheus_http_requests_total[1m]))"
+  - query_name: "range_vector"
+    path: "/api/v1/query_range"
+    query_params:
+      query: "up"
+      start: "2019-12-20T00:00:00.000Z"
+      end:  "2019-12-21T00:00:00.000Z"
+      step: 1h
+  - query_name: "scalar"
+    path: "/api/v1/query"
+    query_params:
+      query: "100"
+
 #------------------------------- RabbitMQ Module -------------------------------
 - module: rabbitmq
   metricsets: ["node", "queue", "connection"]

metricbeat/module/prometheus/_meta/config.yml

@@ -15,6 +15,7 @@
   #ssl.certificate_authorities:
   #  - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
 
+
 # Metrics sent by a Prometheus server using remote_write option
 - module: prometheus
   metricsets: ["remote_write"]
@@ -24,3 +25,25 @@
   # Secure settings for the server using TLS/SSL:
   #ssl.certificate: "/etc/pki/server/cert.pem"
   #ssl.key: "/etc/pki/server/cert.key"
+
+
+- module: prometheus
+  period: 10s
+  hosts: ["localhost:9090"]
+  metricsets: ["query"]
+  queries:
+  - query_name: "instant_vector"
+    path: "/api/v1/query"
+    query_params:
+      query: "sum(rate(prometheus_http_requests_total[1m]))"
+  - query_name: "range_vector"
+    path: "/api/v1/query_range"
+    query_params:
+      query: "up"
+      start: "2019-12-20T00:00:00.000Z"
+      end:  "2019-12-21T00:00:00.000Z"
+      step: 1h
+  - query_name: "scalar"
+    path: "/api/v1/query"
+    query_params:
+      query: "100"

metricbeat/module/prometheus/_meta/fields.yml

@@ -21,3 +21,9 @@
           object_type_mapping_type: "*"
           description: >
             Prometheus metric
+        - name: query.*
+          type: object
+          object_type: double
+          object_type_mapping_type: "*"
+          description: >
+            Prometheus value resulted from PromQL

metricbeat/module/prometheus/query/_meta/data.json

@@ -0,0 +1,27 @@
+{
+    "@timestamp": "2017-10-12T08:05:34.853Z",
+    "event": {
+        "dataset": "prometheus.query",
+        "duration": 115000,
+        "module": "prometheus"
+    },
+    "metricset": {
+        "name": "query",
+        "period": 10000
+    },
+    "prometheus": {
+        "labels": {
+            "__name__": "go_threads",
+            "instance": "localhost:9090",
+            "job": "prometheus"
+        },
+        "query": {
+            "dataType": "vector",
+            "go_threads": 24
+        }
+    },
+    "service": {
+        "address": "localhost:32768",
+        "type": "prometheus"
+    }
+}

metricbeat/module/prometheus/query/_meta/docs.asciidoc

@@ -0,0 +1,54 @@
+This is the `query` metricset to query from querring API[https://prometheus.io/docs/prometheus/latest/querying/api/#expression-queries] of Promtheus.
+
+
+[float]
+=== Configuration
+
+[float]
+==== Instant queries
+
+[source,yaml]
+-------------------------------------------------------------------------------------
+- module: prometheus
+  period: 10s
+  hosts: ["localhost:9090"]
+  metricsets: ["query"]
+  queries:
+  - query_name: "sum_rate_http_requests_total"
+    path: "/api/v1/query"
+    query_params:
+      query: "sum(rate(prometheus_http_requests_total[1m]))"
+-------------------------------------------------------------------------------------
+
+[source,yaml]
+-------------------------------------------------------------------------------------
+- module: prometheus
+  period: 10s
+  hosts: ["localhost:9090"]
+  metricsets: ["query"]
+  queries:
+  - query_name: 'up'
+    path: '/api/v1/query'
+    query_params:
+      query: "up"
+-------------------------------------------------------------------------------------
+
+
+[float]
+==== Range queries
+
+[source,yaml]
+-------------------------------------------------------------------------------------
+- module: prometheus
+  period: 10s
+  metricsets: ["query"]
+  hosts: ["node:9100"]
+  queries:
+  - query_name: "up_master"
+    path: "/api/v1/query_range"
+    query_params:
+      query: "up{node="master01"}"
+      start: "2019-12-20T23:30:00.000Z"
+      end: "2019-12-21T00:00:00.000Z"
+      step: 1h
+-------------------------------------------------------------------------------------

metricbeat/module/prometheus/query/_meta/fields.yml

@@ -0,0 +1,6 @@
+- name: query
+  type: group
+  description: >
+    query metricset
+  release: beta
+  fields:

metricbeat/module/prometheus/query/_meta/test/querymetrics.json

@@ -0,0 +1,24 @@
+{
+    "status" : "success",
+    "data" : {
+        "resultType" : "vector",
+        "result" : [
+            {
+                "metric" : {
+                    "__name__" : "up",
+                    "job" : "prometheus",
+                    "instance" : "localhost:9090"
+                },
+                "value": [ 1435781451.781, "1" ]
+            },
+            {
+                "metric" : {
+                    "__name__" : "up",
+                    "job" : "node",
+                    "instance" : "localhost:9100"
+                },
+                "value" : [ 1435781451.781, "0" ]
+            }
+        ]
+    }
+}

metricbeat/module/prometheus/query/config.go

@@ -0,0 +1,59 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package query
+
+import (
+	"errors"
+
+	"github.com/elastic/beats/v7/libbeat/common"
+)
+
+// Config for "query" metricset
+type Config struct {
+	Queries      []QueryConfig `config:"queries"`
+	DefaultQuery QueryConfig   `config:"default_path"`
+}
+
+// PathConfig is used to make a API request.
+type QueryConfig struct {
+	Path        string        `config:"path"`
+	QueryParams common.MapStr `config:"query_params"`
+	QueryName   string        `config:"query_name"`
+}
+
+func defaultConfig() Config {
+	return Config{
+		DefaultQuery: QueryConfig{
+			Path:      "/api/v1/query",
+			QueryName: "default",
+		},
+	}
+}
+
+// Validate for Prometheus "query" metricset config
+func (p QueryConfig) Validate() error {
+	if p.QueryName == "" {
+		return errors.New("`query_name` can not be empty in path configuration")
+	}
+
+	if p.Path == "" {
+		return errors.New("`path` can not be empty in path configuration")
+	}
+
+	return nil
+}