grafana

Author: AhmetFurkanDEMIR

observability/deploy.sh

@@ -87,8 +87,8 @@ EOF
     echo "✅ Kafka Broker Dashboard (ID: 1860) import edildi."
     # 18276 ID'li dashboard'u da import et
     echo "📊 Importing Kafka Connect Dashboard (ID: 18276) into Grafana..."
-        curl -s https://grafana.com/api/dashboards/18276/revisions/latest/download -o /tmp/dashboard-18276.json
-        cat <<EOF > /tmp/import-dashboard-18276.json
+    curl -s https://grafana.com/api/dashboards/18276/revisions/latest/download -o /tmp/dashboard-18276.json
+    cat <<EOF > /tmp/import-dashboard-18276.json
 {
     "dashboard": $(cat /tmp/dashboard-18276.json),
     "overwrite": true,
@@ -101,13 +101,43 @@ EOF
         }
     ]
 }
+EOF
+    curl -s -X POST \
+        -H "Content-Type: application/json" \
+        -u "$GRAFANA_USER:$GRAFANA_PASS" \
+        --data-binary @/tmp/import-dashboard-18276.json \
+        http://$OBSERVABILITY_DNS:3000/api/dashboards/import
+    echo "✅ Kafka Connect Dashboard (ID: 18276) import edildi."
+
+    # Import all dashboards from grafana/dashboards directory
+    echo "📊 Importing local dashboards from grafana/dashboards..."
+    DASHBOARD_DIR="${SCRIPT_DIR}/grafana/dashboards"
+    for dashboard_file in "$DASHBOARD_DIR"/*.json; do
+        [ -e "$dashboard_file" ] || continue
+        dashboard_name=$(basename "$dashboard_file")
+        echo "   • Importing $dashboard_name ..."
+        cat <<EOF > /tmp/import-dashboard-local.json
+{
+  "dashboard": $(cat "$dashboard_file"),
+  "overwrite": true,
+  "inputs": [
+    {
+      "name": "DS_PROMETHEUS",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "value": "Prometheus"
+    }
+  ]
+}
 EOF
         curl -s -X POST \
-                -H "Content-Type: application/json" \
-                -u "$GRAFANA_USER:$GRAFANA_PASS" \
-                --data-binary @/tmp/import-dashboard-18276.json \
-                http://$OBSERVABILITY_DNS:3000/api/dashboards/import
-        echo "✅ Kafka Connect Dashboard (ID: 18276) import edildi."
+            -H "Content-Type: application/json" \
+            -u "$GRAFANA_USER:$GRAFANA_PASS" \
+            --data-binary @/tmp/import-dashboard-local.json \
+            http://$OBSERVABILITY_DNS:3000/api/dashboards/import
+        echo "      → Imported $dashboard_name"
+    done
+    echo "✅ All local dashboards imported."
 fi
 
 if [ -n "$OBSERVABILITY_DNS" ] && [ "$OBSERVABILITY_DNS" != "null" ]; then

observability/generate-prometheus-config.sh

@@ -139,44 +139,70 @@ cat >> "$PROMETHEUS_CONFIG" << 'YAML_END'
         labels:
           node_type: 'node'
 
+
   - job_name: 'kafka'
     static_configs:
-      - targets:
 YAML_END
 
-# Add kafka targets
-if [ -n "$KAFKA_JMX_TARGETS" ]; then
-    echo "$KAFKA_JMX_TARGETS" | while IFS= read -r target; do
-        echo "        - '$target'" >> "$PROMETHEUS_CONFIG"
-    done
+
+
+# Add kafka broker static_config
+cat >> "$PROMETHEUS_CONFIG" << YAML_END
+      - targets:
+YAML_END
+if [ -n "$KAFKA_BROKER_TARGETS" ]; then
+  echo "$KAFKA_BROKER_TARGETS" | while IFS= read -r target; do
+    echo "          - '$target'" >> "$PROMETHEUS_CONFIG"
+  done
 else
-    echo "        []" >> "$PROMETHEUS_CONFIG"
+  echo "          []" >> "$PROMETHEUS_CONFIG"
 fi
+cat >> "$PROMETHEUS_CONFIG" << YAML_END
+        labels:
+          node_type: 'broker'
+          role: 'broker'
+YAML_END
 
-# Add kafka labels
-cat >> "$PROMETHEUS_CONFIG" << 'YAML_END'
+# Add kafka controller static_config
+cat >> "$PROMETHEUS_CONFIG" << YAML_END
+      - targets:
+YAML_END
+if [ -n "$KAFKA_CONTROLLER_TARGETS" ]; then
+  echo "$KAFKA_CONTROLLER_TARGETS" | while IFS= read -r target; do
+    echo "          - '$target'" >> "$PROMETHEUS_CONFIG"
+  done
+else
+  echo "          []" >> "$PROMETHEUS_CONFIG"
+fi
+cat >> "$PROMETHEUS_CONFIG" << YAML_END
         labels:
-          node_type: 'kafka'
+          node_type: 'controller'
+          role: 'controller'
 
   - job_name: 'kafka_connect'
     static_configs:
       - targets:
 YAML_END
 
-# Add kafka_connect targets
+
+
+# Add kafka_connect targets and labels
 if [ -n "$KAFKA_CONNECT_JMX_TARGETS" ]; then
-    echo "$KAFKA_CONNECT_JMX_TARGETS" | while IFS= read -r target; do
-        echo "        - '$target'" >> "$PROMETHEUS_CONFIG"
-    done
+  echo "      - targets:" >> "$PROMETHEUS_CONFIG"
+  echo "$KAFKA_CONNECT_JMX_TARGETS" | while IFS= read -r target; do
+    echo "          - '$target'" >> "$PROMETHEUS_CONFIG"
+  done
+  cat >> "$PROMETHEUS_CONFIG" << YAML_END
+        labels:
+          node_type: 'kafka_connect'
+YAML_END
 else
-    echo "        []" >> "$PROMETHEUS_CONFIG"
-fi
-
-# Add kafka_connect labels
-cat >> "$PROMETHEUS_CONFIG" << 'YAML_END'
+  echo "      - targets: []" >> "$PROMETHEUS_CONFIG"
+  cat >> "$PROMETHEUS_CONFIG" << YAML_END
         labels:
           node_type: 'kafka_connect'
 YAML_END
+fi
 
 echo "✅ Configuration file written successfully"
 echo ""