From 82c8d519b47a50a69bd65b77345a8035ebf828f6 Mon Sep 17 00:00:00 2001 From: alejandro Date: Mon, 22 Jan 2024 13:25:43 +0100 Subject: [PATCH] update grafana extension --- pandora_console/extensions/grafana/index.php | 2 +- pandora_console/extensions/grafana/query.php | 4 ++-- pandora_console/extensions/grafana/search.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/extensions/grafana/index.php b/pandora_console/extensions/grafana/index.php index e925e56233..d46b60d59c 100644 --- a/pandora_console/extensions/grafana/index.php +++ b/pandora_console/extensions/grafana/index.php @@ -3,7 +3,7 @@ // Allow Grafana proxy header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Methods: GET, POST, OPTIONS'); -header('Access-Control-Allow-Headers: Origin, Content-Type, Accept, X-Grafana-Org-Id, X-Grafana-NoCache, X-DS-Authorization'); +header('Access-Control-Allow-Headers: Origin, Content-Type, Accept, X-Grafana-Org-Id, X-Grafana-NoCache, X-DS-Authorization, Authorization'); // Get all request headers $headers = apache_request_headers(); diff --git a/pandora_console/extensions/grafana/query.php b/pandora_console/extensions/grafana/query.php index c5812a32c9..3c7a843542 100644 --- a/pandora_console/extensions/grafana/query.php +++ b/pandora_console/extensions/grafana/query.php @@ -2,7 +2,7 @@ // Allow Grafana proxy. header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Methods: GET, POST, OPTIONS'); -header('Access-Control-Allow-Headers: Origin, Content-Type, Accept, X-Grafana-Org-Id, X-Grafana-NoCache, X-DS-Authorization'); +header('Access-Control-Allow-Headers: Origin, Content-Type, Accept, X-Grafana-Org-Id, X-Grafana-NoCache, X-DS-Authorization, Authorization'); // Get all request headers. $headers = apache_request_headers(); @@ -38,7 +38,7 @@ if ($headers['Authorization']) { $result_data = []; // Decode target data sent by datasource plugin in Grafana - $target_data = json_decode($target['target'], true); + $target_data = $target['target']; if ($target_data['module']) { // Get module name as target if not defined in Grafana. diff --git a/pandora_console/extensions/grafana/search.php b/pandora_console/extensions/grafana/search.php index 48a4f819a9..9193dd290e 100644 --- a/pandora_console/extensions/grafana/search.php +++ b/pandora_console/extensions/grafana/search.php @@ -3,7 +3,7 @@ // Allow Grafana proxy header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Methods: GET, POST, OPTIONS'); -header('Access-Control-Allow-Headers: Origin, Content-Type, Accept, X-Grafana-Org-Id, X-Grafana-NoCache, X-DS-Authorization'); +header('Access-Control-Allow-Headers: Origin, Content-Type, Accept, X-Grafana-Org-Id, X-Grafana-NoCache, X-DS-Authorization, Authorization'); // Get all request headers $headers = apache_request_headers();