Merge branch 'master' into szuro-patch-1

Author: szuro

.drone/drone.jsonnet

@@ -16,11 +16,17 @@ local run(name, commands) = {
 };
 
 [
-  pipeline('build', [
-    run('lint-fmt', [
-      'make install-ci-deps',
-      'make lint-fmt',
-      'make lint-mixins',
-    ]),
-  ]),
+  pipeline(
+    'build', [
+      run('lint-fmt', [
+        'make install-ci-deps',
+        'make lint-fmt',
+        'make lint-mixins',
+      ]),
+      run('tests', [
+        'make install-ci-deps',
+        'make tests',
+      ]),
+    ]
+  ),
 ]

.drone/drone.yml

@@ -8,12 +8,17 @@ steps:
   - make lint-mixins
   image: golang:1.18
   name: lint-fmt
+- commands:
+  - make install-ci-deps
+  - make tests
+  image: golang:1.18
+  name: tests
 trigger:
   event:
     include:
     - pull_request
 ---
 kind: signature
-hmac: 78a1dae3b7fa280bb32281b3ddbdbc7d1a9a7ab54681a00ed536876e2bdca55d
+hmac: 569cd1940689a70b907683e347d832a4a2809c1dbf23035ab036acf88b72a57a
 
 ...

Makefile

@@ -39,6 +39,9 @@ lint-mixins:
 	done; \
 	exit $$RESULT
 
+tests:
+	pushd . && cd ./common-lib && make vendor && make tests
+
 drone:
 	drone jsonnet --stream --source .drone/drone.jsonnet --target .drone/drone.yml --format yaml
 	drone lint .drone/drone.yml

apache-cassandra-mixin/.lint

@@ -17,6 +17,8 @@ exclusions:
       - panel: "Keyspaces count"
       - panel: "Repair jobs started"
       - panel: "Repair jobs completed"
+  panel-datasource-rule:
+    reason: "Loki datasource variable is being named as loki_datasource now while linter expects 'datasource'"
   template-datasource-rule:
     reason: "Based on new convention we are using variable names prometheus_datasource and loki_datasource where as linter expects 'datasource'"
   template-instance-rule:

apache-cassandra-mixin/alerts/alerts.libsonnet

@@ -79,7 +79,7 @@
           {
             alert: 'HintsStoredOnNode',
             expr: |||
-              cassandra_storage_totalhints_count > %(alertsWarningHintsStored1m)s
+              increase(cassandra_storage_totalhints_count[5m]) > %(alertsWarningHintsStored1m)s
             ||| % $._config,
             'for': '1m',
             labels: {
@@ -115,7 +115,7 @@
           {
             alert: 'HighCpuUsage',
             expr: |||
-              jvm_process_cpu_load * 100 > %(alertsCriticalHighCpuUsage5m)s
+              jvm_process_cpu_load{job=~"integrations/apache-cassandra"} * 100 > %(alertsCriticalHighCpuUsage5m)s
             ||| % $._config,
             'for': '5m',
             labels: {
@@ -133,7 +133,7 @@
           {
             alert: 'HighMemoryUsage',
             expr: |||
-              sum(jvm_memory_usage_used_bytes{area="Heap"}) / sum(jvm_physical_memory_size) * 100 > %(alertsCriticalHighMemoryUsage5m)s
+              sum(jvm_memory_usage_used_bytes{job=~"integrations/apache-cassandra", area="Heap"}) / sum(jvm_physical_memory_size{job=~"integrations/apache-cassandra"}) * 100 > %(alertsCriticalHighMemoryUsage5m)s
             ||| % $._config,
             'for': '5m',
             labels: {

apache-couchdb-mixin/config.libsonnet

@@ -1,5 +1,9 @@
 {
   _config+:: {
+    enableMultiCluster: false,
+    couchDBSelector: if self.enableMultiCluster then 'job=~"$job", cluster=~"$cluster"' else 'job=~"$job"',
+    multiClusterSelector: 'job=~"$job"',
+
     dashboardTags: ['apache-couchdb-mixin'],
     dashboardPeriod: 'now-1h',
     dashboardTimezone: 'default',