Merge branch 'master' into dasomeone/update_ci

Author: Dasomeone

nginx-mixin/.lint

@@ -5,3 +5,9 @@ exclusions:
     reason: "Units are undefined where panel description is clear, and the entity being graphed is not available in default set of available units."
   template-datasource-rule:
     reason: "mixtool upgrade made this rule stricter. TODO: Fix errors and remove the warning exclusion"
+  template-job-rule:
+    reason: "NGINX Overview dashboard does not use a job label"
+  target-job-rule:
+    reason: "NGINX Overview dashboard does not use a job label"
+  target-rate-interval-rule:
+    reason: "using $__rate_interval breaks the dashboard hence using [5m] instead"

nginx-mixin/README.md

@@ -1,18 +1,16 @@
 # Nginx Mixin
 
-This mixin is a thin veneer over the dashboard designed and published by [Ward Bekker](https://grafana.com/orgs/wardbekker1) in the [Grafana dashboards library](https://grafana.com/grafana/dashboards/12559).
+This mixin is a thin veneer over the dashboard designed and published by [Ward Bekker](https://grafana.com/orgs/wardbekker1) in the [Grafana dashboards library](https://grafana.com/grafana/dashboards/12559) and the metrics dashboard is collected from the [official NGINX exporter repository](https://github.com/nginxinc/nginx-prometheus-exporter/blob/main/grafana/dashboard.png).
 
 Specifically this mixin adds a configurable `cluster` variable to the dashboard in order to support it's use in one or many kubernetes clusters.
 
 The mixin uses revision 14 of the dashboard currently. Change `DASHBOARD_REV` in the Makefile to fetch a different revision of the dashboard.
 
-The Nginx mixin contains the following dashboard:
+The Nginx mixin contains the following dashboards:
 
-- Nginx...
+- **Nginx Overview**: This dashboard provides a comprehensive view of various NGINX metrics, allowing you to monitor performance and health across multiple dimensions.
 
-# Nginx overview
-
-...
+- **Nginx Logs**: This dashboard showcases panels powered by Logs, providing insights into log data to help diagnose issues and track the operational status of your NGINX deployments.
 
 ## Install tools
 

nginx-mixin/dashboards/nginx-overview.json renamed to nginx-mixin/dashboards/nginx-logs.json

@@ -2190,8 +2190,8 @@
     ]
   },
   "timezone": "",
-  "title": "Nginx access logs",
+  "title": "NGINX Logs",
   "uid": "T512JVH7z",
   "version": 4,
   "weekStart": ""
-}
+}