feat: #207 allow to collect metrics from non-swarm nodes

ptah-sh · Oct 5, 2024 · cb4f077 · cb4f077
1 parent b0280d2
commit cb4f077
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/api-nodes/Http/Controllers/MetricsController.php b/api-nodes/Http/Controllers/MetricsController.php
@@ -45,10 +45,6 @@ class MetricsController
     // Please don't judge me for this code. I'm a PHP developer.
     public function __invoke(Request $request, Logger $log, Node $node)
     {
-        if ($node->swarm === null) {
-            return new Response('{}', 204);
-        }
-
         // TODO: cache this with the new Laravel cache system (stale-while-revalidate from the recent release)
         $interfaces = collect($node->data->host->networks)->pluck('if_name')->unique()->toArray();
 
@@ -228,7 +224,7 @@ public function __invoke(Request $request, Logger $log, Node $node)
                 }
             }
 
-            $response = Metrics::importPrometheusMetrics($node->swarm->id, $node->id, $ingestMetrics);
+            $response = Metrics::importPrometheusMetrics($node->id, $ingestMetrics);
         }
 
         $response = new Response('{}', 204);

diff --git a/app/Services/Metrics.php b/app/Services/Metrics.php
@@ -7,11 +7,10 @@
 // Multitenancy for single node: https://docs.victoriametrics.com/single-server-victoriametrics/#prometheus-querying-api-enhancements
 class Metrics
 {
-    public static function importPrometheusMetrics($swarmId, $nodeId, $metrics)
+    public static function importPrometheusMetrics($nodeId, $metrics)
     {
         $query = '';
-        $query .= '?extra_label=swarm_id='.$swarmId;
-        $query .= '&extra_label=node_id='.$nodeId;
+        $query .= '?extra_label=node_id='.$nodeId;
 
         return Http::withBody(implode("\n", $metrics), 'text/plain')->post(config('database.victoriametrics.url').'/api/v1/import/prometheus'.$query);
     }

diff --git a/config/billing.php b/config/billing.php
@@ -44,7 +44,7 @@
                 'nodes' => ['limit' => 1, 'soft' => false, 'reset_period' => null],
                 'swarms' => ['limit' => 1, 'soft' => false, 'reset_period' => null],
                 'services' => ['limit' => 3, 'soft' => false, 'reset_period' => null],
-                'deployments' => ['limit' => 20000, 'soft' => false, 'reset_period' => 'daily'],
+                'deployments' => ['limit' => 20, 'soft' => false, 'reset_period' => 'daily'],
             ],
         ],
         'selfHostedPlan' => [

diff --git a/resources/js/Pages/Nodes/Index.vue b/resources/js/Pages/Nodes/Index.vue
@@ -23,19 +23,29 @@ function getMetric(metric) {
 }
 
 const avgLoad = computed(() => {
-    return `${getMetric("ptah_node_load_avg_1m")} / ${getMetric("ptah_node_load_avg_5m")} / ${getMetric("ptah_node_load_avg_15m")}`;
+    const metric1m = getMetric("ptah_node_load_avg_1m") ?? "...";
+    const metric5m = getMetric("ptah_node_load_avg_5m") ?? "...";
+    const metric15m = getMetric("ptah_node_load_avg_15m") ?? "...";
+
+    return `${metric1m} / ${metric5m} / ${metric15m}`;
 });
 
 const cpuUsage = computed(() => {
-    return getMetric("cpu_usage") + "%";
+    const metric = getMetric("cpu_usage") ?? "...";
+
+    return metric + "%";
 });
 
 const memoryUsage = computed(() => {
-    return getMetric("memory_usage") + "%";
+    const metric = getMetric("memory_usage") ?? "...";
+
+    return metric + "%";
 });
 
 const diskUsage = computed(() => {
-    return getMetric("disk_usage") + "%";
+    const metric = getMetric("disk_usage") ?? "...";
+
+    return metric + "%";
 });
 
 const refreshTimeoutId = ref(0);
@@ -126,7 +136,7 @@ onUnmounted(() => {
                             </template>
                         </div>
                     </div>
-                    <div class="flex justify-between">
+                    <div class="flex justify-between" v-if="node.online">
                         <div class="flex flex-col">
                             <div class="flex flex-row justify-between">
                                 <div class="flex flex-col">