Adding upstream version 1.47.0.upstream/1.47.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 99 insertions, 3 deletions

diff --git a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf b/src/go/plugin/go.d/config/go.d/sd/net_listeners.conf
index 8d59c0dcb..4462fc112 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf
+++ b/src/go/plugin/go.d/config/go.d/sd/net_listeners.conf
@@ -16,6 +16,8 @@ classify:
         expr: '{{ and (eq .Port "8161") (eq .Comm "activemq") }}'
       - tags: "apache"
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "apache" "apache2" "httpd") }}'
+      - tags: "beanstalk"
+        expr: '{{ or (eq .Port "11300") (eq .Comm "beanstalkd") }}'
       - tags: "bind"
         expr: '{{ and (eq .Port "8653") (eq .Comm "bind" "named") }}'
       - tags: "cassandra"
@@ -40,6 +42,8 @@ classify:
         expr: '{{ and (eq .Protocol "UDP") (eq .Port "53") (eq .Comm "dnsmasq") }}'
       - tags: "docker_engine"
         expr: '{{ and (eq .Port "9323") (eq .Comm "dockerd") }}'
+      - tags: "dovecot"
+        expr: '{{ and (eq .Port "24242") (eq .Comm "dovecot") }}'
       - tags: "elasticsearch"
         expr: '{{ or (eq .Port "9200") (glob .Cmdline "*elasticsearch*" "*opensearch*") }}'
       - tags: "envoy"
@@ -48,6 +52,8 @@ classify:
         expr: '{{ and (eq .Port "24220") (glob .Cmdline "*fluentd*") }}'
       - tags: "freeradius"
         expr: '{{ and (eq .Port "18121") (eq .Comm "freeradius") }}'
+      - tags: "gearman"
+        expr: '{{ or (eq .Port "4730") (eq .Comm "gearmand") }}'
       - tags: "geth"
         expr: '{{ and (eq .Port "6060") (eq .Comm "geth") }}'
       - tags: "haproxy"
@@ -58,6 +64,10 @@ classify:
         expr: '{{ and (eq .Port "9870") (eq .Comm "hadoop") }}'
       - tags: "hdfs_datanode"
         expr: '{{ and (eq .Port "9864") (eq .Comm "hadoop") }}'
+      - tags: "icecast"
+        expr: '{{ and (eq .Port "8000") (eq .Comm "icecast") }}'
+      - tags: "ipfs"
+        expr: '{{ and (eq .Port "5001") (eq .Comm "ipfs") }}'
       - tags: "kubelet"
         expr: '{{ and (eq .Port "10250" "10255") (eq .Comm "kubelet") }}'
       - tags: "kubeproxy"
@@ -66,8 +76,12 @@ classify:
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "lighttpd") }}'
       - tags: "logstash"
         expr: '{{ and (eq .Port "9600") (glob .Cmdline "*logstash*") }}'
+      - tags: "memcached"
+        expr: '{{ or (eq .Port "11211") (eq .Comm "memcached") }}'
       - tags: "mongodb"
         expr: '{{ or (eq .Port "27017") (eq .Comm "mongod") }}'
+      - tags: "monit"
+        expr: '{{ or (eq .Port "2812") (eq .Comm "monit") }}'
       - tags: "mysql"
         expr: '{{ or (eq .Port "3306") (eq .Comm "mysqld" "mariadbd") }}'
       - tags: "nginx"
@@ -90,20 +104,34 @@ classify:
         expr: '{{ and (eq .Port "8081") (eq .Comm "pdns_recursor") }}'
       - tags: "proxysql"
         expr: '{{ or (eq .Port "6032") (eq .Comm "proxysql") }}'
+      - tags: "puppet"
+        expr: '{{ or (eq .Port "8140") (glob .Cmdline "*puppet-server*") }}'
       - tags: "rabbitmq"
         expr: '{{ or (eq .Port "15672") (glob .Cmdline "*rabbitmq*") }}'
       - tags: "redis"
         expr: '{{ or (eq .Port "6379") (eq .Comm "redis-server") }}'
+      - tags: "rethinkdb"
+        expr: '{{ and (eq .Port "28015") (eq .Comm "rethinkdb") }}'
+      - tags: "riak"
+        expr: '{{ and (eq .Port "8098") (glob .Cmdline "*riak*") }}'
       - tags: "rspamd"
         expr: '{{ and (eq .Port "11334") (eq .Comm "rspamd") }}'
+      - tags: "squid"
+        expr: '{{ and (eq .Port "3128") (eq .Comm "squid") }}'
       - tags: "supervisord"
         expr: '{{ and (eq .Port "9001") (eq .Comm "supervisord") }}'
+      - tags: "tomcat"
+        expr: '{{ and (eq .Port "8080") (glob .Cmdline "*tomcat*") }}'
+      - tags: "tor"
+        expr: '{{ and (eq .Port "9051") (eq .Comm "tor") }}'
       - tags: "traefik"
         expr: '{{ and (eq .Port "80" "8080") (eq .Comm "traefik") }}'
       - tags: "unbound"
         expr: '{{ and (eq .Port "8953") (eq .Comm "unbound") }}'
       - tags: "upsd"
         expr: '{{ or (eq .Port "3493") (eq .Comm "upsd") }}'
+      - tags: "uwsgi"
+        expr: '{{ and (eq .Port "1717") (eq .Comm "uwsgi") }}'
       - tags: "vernemq"
         expr: '{{ and (eq .Port "8888") (glob .Cmdline "*vernemq*") }}'
       - tags: "zookeeper"
@@ -129,6 +157,11 @@ compose:
           module: apache
           name: local
           url: http://{{.Address}}/server-status?auto
+      - selector: "beanstalk"
+        template: |
+          module: beanstalk
+          name: local
+          address: {{.Address}}
       - selector: "bind"
         template: |
           module: bind
@@ -193,6 +226,11 @@ compose:
           module: docker_engine
           name: local
           url: http://{{.Address}}/metrics
+      - selector: "dovecot"
+        template: |
+          module: dovecot
+          name: local
+          address: {{.Address}}
       - selector: "elasticsearch"
         template: |
           module: elasticsearch
@@ -227,6 +265,11 @@ compose:
           address: {{.IPAddress}}
           port: {{.Port}}
           secret: adminsecret
+      - selector: "gearman"
+        template: |
+          module: gearman
+          name: local
+          address: {{.Address}}
       - selector: "geth"
         template: |
           module: geth
@@ -252,6 +295,16 @@ compose:
           module: hdfs
           name: datanode_local
           url: http://{{.Address}}/jmx
+      - selector: "icecast"
+        template: |
+          module: icecast
+          name: local
+          url: http://{{.Address}}
+      - selector: "ipfs"
+        template: |
+          module: ipfs
+          name: local
+          url: http://{{.Address}}
       - selector: "kubelet"
         template: |
           module: k8s_kubelet
@@ -277,11 +330,23 @@ compose:
           module: logstash
           name: local
           url: http://{{.Address}}
+      - selector: "memcached"
+        template: |
+          module: memcached
+          name: local
+          address: {{.Address}}
       - selector: "mongodb"
         template: |
           module: mongodb
           name: local
           uri: mongodb://{{.Address}}
+      - selector: "monit"
+        template: |
+          module: monit
+          name: local
+          url: http://{{.Address}}
+          username: admin
+          password: monit
       - selector: "mysql"
         template: |
           - module: mysql
@@ -330,6 +395,16 @@ compose:
           module: pika
           name: local
           address: redis://@{{.IPAddress}}:{{.Port}}
+      - selector: "rethinkdb"
+        template: |
+          module: rethinkdb
+          name: local
+          address: {{.Address}}
+      - selector: "riak"
+        template: |
+          module: riakkv
+          name: local
+          url: http://{{.Address}}/stats
       - selector: "rspamd"
         template: |
           module: rspamd
@@ -365,6 +440,12 @@ compose:
           module: proxysql
           name: local
           dsn: stats:stats@tcp({{.Address}})/
+      - selector: "puppet"
+        template: |
+          module: puppet
+          name: local
+          url: https://{{.Address}}
+          tls_skip_verify: yes
       - selector: "rabbitmq"
         template: |
           module: rabbitmq
@@ -378,6 +459,11 @@ compose:
           module: redis
           name: local
           address: redis://@{{.Address}}
+      - selector: "squid"
+        template: |
+          module: squid
+          name: local
+          url: http://{{.Address}}
       - selector: "supervisord"
         template: |
           module: supervisord
@@ -388,11 +474,16 @@ compose:
           module: traefik
           name: local
           url: http://{{.Address}}/metrics
-      - selector: "traefik"
+      - selector: "tomcat"
         template: |
-          module: traefik
+          module: tomcat
           name: local
-          url: http://{{.Address}}/metrics
+          url: http://{{.Address}}
+      - selector: "tor"
+        template: |
+          module: tor
+          name: local
+          address: {{.Address}}
       - selector: "unbound"
         template: |
           module: unbound
@@ -403,6 +494,11 @@ compose:
           module: upsd
           name: local
           address: {{.Address}}
+      - selector: "uwsgi"
+        template: |
+          module: uwsgi
+          name: local
+          address: {{.Address}}
       - selector: "vernemq"
         template: |
           module: vernemq