Update the list of supported ClickHouse versions to the latest and relevant metrics

clickhouse/README.md

@@ -98,7 +98,7 @@ See [service_checks.json][9] for a list of service checks provided by this integ
 Need help? Contact [Datadog support][10].
 
 
-[1]: https://clickhouse.yandex
+[1]: https://clickhouse.com/
 [2]: https://docs.datadoghq.com/agent/kubernetes/integrations/
 [3]: /account/settings/agent/latest
 [4]: https://github.com/DataDog/integrations-core/blob/master/clickhouse/datadog_checks/clickhouse/data/conf.yaml.example

clickhouse/assets/configuration/spec.yaml

@@ -87,16 +87,42 @@ files:
   - template: logs
     example:
     - source: clickhouse
+      service: clickhouse
       type: file
       path:  /var/log/clickhouse-server/clickhouse-server.log
+      tags:
+        - format:plain
       log_processing_rules:
         - type: multi_line
-          name: log_start_with_date
-          pattern: \d{4}\.\d{2}\.\d{2}
+          name: new_log_start_with_date
+          pattern: '\d{4}\.\d{2}\.\d{2}'
     - source: clickhouse
+      service: clickhouse
       type: file
       path: /var/log/clickhouse-server/clickhouse-server.err.log
+      tags:
+        - format:plain
       log_processing_rules:
         - type: multi_line
-          name: log_start_with_date
-          pattern: \d{4}\.\d{2}\.\d{2}
+          name: new_log_start_with_date
+          pattern: '\d{4}\.\d{2}\.\d{2}'
+    - source: clickhouse
+      service: clickhouse
+      type: file
+      path:  /var/log/clickhouse-server/clickhouse-server.log
+      tags:
+        - format:json
+      log_processing_rules:
+        - type: multi_line
+          name: new_log_start_with_json
+          pattern: '\{'
+    - source: clickhouse
+      service: clickhouse
+      type: file
+      path: /var/log/clickhouse-server/clickhouse-server.err.log
+      tags:
+        - format:json
+      log_processing_rules:
+        - type: multi_line
+          name: new_log_start_with_json
+          pattern: '\{'