update to support carbonapi

Icinga · Aug 15, 2024 · 047f6cf · 047f6cf
1 parent 2f675e7
commit 047f6cf
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/library/Graphite/Graphing/MetricsQuery.php b/library/Graphite/Graphing/MetricsQuery.php
@@ -169,15 +169,21 @@ public function fetchColumn()
         }
 
         $client = $this->dataSource->getClient();
-        $url = Url::fromPath('metrics/expand', [
+        $url = Url::fromPath('metrics/find', [
             'query' => $this->base->resolve($filter, '*')
         ]);
         $res = Json::decode($client->request($url));
-        natsort($res->results);
 
-        IPT::recordf('Fetched %s metric(s) from %s', count($res->results), (string) $client->completeUrl($url));
+        $results = [];
+        foreach ($res as $item) {
+            $results[] = $item->id;
+        }
+
+        natsort($results);
+
+        IPT::recordf('Fetched %s metric(s) from %s', count($results), (string) $client->completeUrl($url));
 
-        return array_values($res->results);
+        return array_values($results);
     }
 
     public function fetchOne()