Adding upstream version 1.47.0.upstream/1.47.0upstream

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

1 files changed, 72 insertions, 1 deletions

diff --git a/src/go/collectors/go.d.plugin/config/go.d/sd/docker.conf b/src/go/plugin/go.d/config/go.d/sd/docker.conf
index b0f1a3aa9..c93fbef87 100644
--- a/src/go/collectors/go.d.plugin/config/go.d/sd/docker.conf
+++ b/src/go/plugin/go.d/config/go.d/sd/docker.conf
@@ -26,6 +26,8 @@ classify:
     match:
       - tags: "apache"
         expr: '{{ match "sp" .Image "httpd httpd:* */apache */apache:* */apache2 */apache2:*" }}'
+      - tags: "beanstalk"
+        expr: '{{ match "sp" .Image "*/beanstalkd */beanstalkd:*" }}'
       - tags: "cockroachdb"
         expr: '{{ match "sp" .Image "cockroachdb/cockroach cockroachdb/cockroach:*" }}'
       - tags: "consul"
@@ -36,10 +38,18 @@ classify:
         expr: '{{ or (eq .PrivatePort "8091") (match "sp" .Image "couchbase couchbase:*") }}'
       - tags: "couchdb"
         expr: '{{ or (eq .PrivatePort "5984") (match "sp" .Image "couchdb couchdb:*") }}'
+      - tags: "dovecot"
+        expr: '{{ or (eq .PrivatePort "24242") (match "sp" .Image "*/dovecot */dovecot:*") }}'
       - tags: "elasticsearch"
         expr: '{{ or (eq .PrivatePort "9200") (match "sp" .Image "elasticsearch elasticsearch:* */elasticsearch */elasticsearch:* */opensearch */opensearch:*") }}'
+      - tags: "gearman"
+        expr: '{{ and (eq .PrivatePort "4730") (match "sp" .Image "*/gearmand */gearmand:*") }}'
+      - tags: "ipfs"
+        expr: '{{ and (eq .PrivatePort "5001") (match "sp" .Image "ipfs/kubo ipfs/kubo:*") }}'
       - tags: "lighttpd"
         expr: '{{ match "sp" .Image "*/lighttpd */lighttpd:*" }}'
+      - tags: "memcached"
+        expr: '{{ or (eq .PrivatePort "11211") (match "sp" .Image "memcached memcached:* */memcached */memcached:*") }}'
       - tags: "mongodb"
         expr: '{{ or (eq .PrivatePort "27017") (match "sp" .Image "mongo mongo:* */mongodb */mongodb:* */mongodb-community-server */mongodb-community-server:*") }}'
       - tags: "mysql"
@@ -54,12 +64,22 @@ classify:
         expr: '{{ or (eq .PrivatePort "5432") (match "sp" .Image "postgres postgres:* */postgres */postgres:* */postgresql */postgresql:*") }}'
       - tags: "proxysql"
         expr: '{{ or (eq .PrivatePort "6032") (match "sp" .Image "*/proxysql */proxysql:*") }}'
+      - tags: "puppet"
+        expr: '{{ or (eq .PrivatePort "8140") (match "sp" .Image "puppet/puppetserver puppet/puppetserver:*") }}'
       - tags: "rabbitmq"
         expr: '{{ or (eq .PrivatePort "15672") (match "sp" .Image "rabbitmq rabbitmq:* */rabbitmq */rabbitmq:*") }}'
       - tags: "redis"
         expr: '{{ or (eq .PrivatePort "6379") (match "sp" .Image "redis redis:* */redis */redis:*") }}'
+      - tags: "rethinkdb"
+        expr: '{{ and (eq .PrivatePort "28015") (match "sp" .Image "rethinkdb rethinkdb:* */rethinkdb */rethinkdb:*") }}'
+      - tags: "squid"
+        expr: '{{ match "sp" .Image "*/squid */squid:*" }}'
       - tags: "tengine"
         expr: '{{ match "sp" .Image "*/tengine */tengine:*" }}'
+      - tags: "tor"
+        expr: '{{ and (eq .PrivatePort "9051") (match "sp" .Image "*/tor */tor:*") }}'
+      - tags: "tomcat"
+        expr: '{{ match "sp" .Image "tomcat tomcat:* */tomcat */tomcat:*" }}'
       - tags: "vernemq"
         expr: '{{ match "sp" .Image "*/vernemq */vernemq:*" }}'
       - tags: "zookeeper"
@@ -73,6 +93,11 @@ compose:
           module: apache
           name: docker_{{.Name}}
           url: http://{{.Address}}/server-status?auto
+      - selector: "beanstalk"
+        template: |
+          module: beanstalk
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "cockroachdb"
         template: |
           module: cockroachdb
@@ -103,6 +128,11 @@ compose:
           module: couchdb
           name: docker_{{.Name}}
           url: http://{{.Address}}
+      - selector: "dovecot"
+        template: |
+          module: dovecot
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "elasticsearch"
         template: |
           module: elasticsearch
@@ -115,11 +145,26 @@ compose:
           username: admin
           password: admin
           {{ end -}}
+      - selector: "gearman"
+        template: |
+          module: gearman
+          name: docker_{{.Name}}
+          address: {{.Address}}
+      - selector: "ipfs"
+        template: |
+          module: ipfs
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
       - selector: "lighttpd"
         template: |
           module: lighttpd
           name: docker_{{.Name}}
           url: http://{{.Address}}/server-status?auto
+      - selector: "memcached"
+        template: |
+          module: memcached
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "mongodb"
         template: |
           module: mongodb
@@ -154,6 +199,11 @@ compose:
           module: pika
           name: docker_{{.Name}}
           address: redis://@{{.Address}}
+      - selector: "rethinkdb"
+        template: |
+          module: rethinkdb
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "postgres"
         template: |
           module: postgres
@@ -164,6 +214,12 @@ compose:
           module: proxysql
           name: docker_{{.Name}}
           dsn: stats:stats@tcp({{.Address}})/
+      - selector: "puppet"
+        template: |
+          module: puppet
+          name: docker_{{.Name}}
+          url: https://{{.Address}}
+          tls_skip_verify: yes
       - selector: "rabbitmq"
         template: |
           module: rabbitmq
@@ -174,11 +230,26 @@ compose:
           module: redis
           name: docker_{{.Name}}
           address: redis://@{{.Address}}
+      - selector: "squid"
+        template: |
+          module: squid
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
       - selector: "tengine"
         template: |
           module: tengine
           name: docker_{{.Name}}
           url: http://{{.Address}}/us
+      - selector: "tomcat"
+        template: |
+          module: tomcat
+          name: docker_{{.Name}}
+          url: http://{{.Address}}
+      - selector: "tor"
+        template: |
+          module: tor
+          name: docker_{{.Name}}
+          address: {{.Address}}
       - selector: "vernemq"
         template: |
           module: vernemq
@@ -186,6 +257,6 @@ compose:
           url: http://{{.Address}}/metrics
       - selector: "zookeeper"
         template: |
-          module: vernemq
+          module: zookeeper
           name: docker_{{.Name}}
           address: {{.Address}}