diff --git a/dependency/memcached/12.1.1/charts/common-18.0.1.tgz b/dependency/memcached/12.1.1/charts/common-18.0.1.tgz deleted file mode 100644 index 60d09f7506f..00000000000 Binary files a/dependency/memcached/12.1.1/charts/common-18.0.1.tgz and /dev/null differ diff --git a/dependency/memcached/12.1.1/.helmignore b/dependency/memcached/12.2.0/.helmignore similarity index 100% rename from dependency/memcached/12.1.1/.helmignore rename to dependency/memcached/12.2.0/.helmignore diff --git a/dependency/memcached/12.1.1/CHANGELOG.md b/dependency/memcached/12.2.0/CHANGELOG.md similarity index 94% rename from dependency/memcached/12.1.1/CHANGELOG.md rename to dependency/memcached/12.2.0/CHANGELOG.md index 35422ea0118..dcb24575b5d 100644 --- a/dependency/memcached/12.1.1/CHANGELOG.md +++ b/dependency/memcached/12.2.0/CHANGELOG.md @@ -15,6 +15,10 @@ title: Changelog + + + + ## [memcached-11.1.18](https://github.com/truecharts/charts/compare/memcached-11.1.17...memcached-11.1.18) (2024-02-12) ### Chore @@ -93,7 +97,4 @@ title: Changelog -- update metadata in chart.yaml ([#17457](https://github.com/truecharts/charts/issues/17457)) - - -## [memcached-11.1.9](https://github.com/truecharts/charts/compare/memcached-11.1.8...memcached-11.1.9) (2024-01-21) +- update metadata in chart.yaml ([#17457](https://github.com/truecharts/charts/issues/17457)) \ No newline at end of file diff --git a/dependency/memcached/12.1.1/Chart.yaml b/dependency/memcached/12.2.0/Chart.yaml similarity index 94% rename from dependency/memcached/12.1.1/Chart.yaml rename to dependency/memcached/12.2.0/Chart.yaml index 13864386ab2..386d0b8b0e1 100644 --- a/dependency/memcached/12.1.1/Chart.yaml +++ b/dependency/memcached/12.2.0/Chart.yaml @@ -10,7 +10,7 @@ apiVersion: v2 appVersion: 1.6.23 dependencies: - name: common - version: 18.0.1 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" @@ -24,7 +24,7 @@ keywords: - memcached - database - cache -kubeVersion: '>=1.24.0-0' +kubeVersion: ">=1.24.0-0" maintainers: - name: TrueCharts email: info@truecharts.org @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/dependency/memcached - https://hub.docker.com/r/bitnami/memcached type: application -version: 12.1.1 +version: 12.2.0 diff --git a/dependency/memcached/12.1.1/README.md b/dependency/memcached/12.2.0/README.md similarity index 100% rename from dependency/memcached/12.1.1/README.md rename to dependency/memcached/12.2.0/README.md diff --git a/dependency/memcached/12.1.1/app-readme.md b/dependency/memcached/12.2.0/app-readme.md similarity index 100% rename from dependency/memcached/12.1.1/app-readme.md rename to dependency/memcached/12.2.0/app-readme.md diff --git a/dependency/memcached/12.2.0/charts/common-18.0.3.tgz b/dependency/memcached/12.2.0/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/dependency/memcached/12.2.0/charts/common-18.0.3.tgz differ diff --git a/dependency/memcached/12.2.0/dashboard.json b/dependency/memcached/12.2.0/dashboard.json new file mode 100644 index 00000000000..594865d84a6 --- /dev/null +++ b/dependency/memcached/12.2.0/dashboard.json @@ -0,0 +1,1285 @@ +{ + "annotations": { + "list": [ ] + }, + "editable": true, + "gnetId": null, + "graphTooltip": 0, + "hideControls": false, + "links": [ ], + "refresh": "10s", + "rows": [ + { + "collapse": false, + "height": "250px", + "panels": [ + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 1, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 6, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum(rate(memcached_commands_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\", command=\"get\", status=\"hit\"}[$__rate_interval])) / sum(rate(memcached_commands_total{cluster=~\"$cluster\", job=~\"$job\", command=\"get\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "Hit Rate", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Hit Rate", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 2, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 6, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "topk(20,\n max by (cluster, job, instance) (\n memcached_current_connections{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"} / memcached_max_connections{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}\n))\n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{ cluster }} / {{ job }} / {{ instance }}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Top 20 Highest Connection Usage", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Hits", + "titleSize": "h6" + }, + { + "collapse": false, + "height": "250px", + "panels": [ + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 3, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 4, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(command, status) (rate(memcached_commands_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{command}} {{status}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Commands", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 4, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 4, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (rate(memcached_items_evicted_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Evictions", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 5, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 4, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (rate(memcached_items_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Stored", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Ops", + "titleSize": "h6" + }, + { + "collapse": false, + "height": "250px", + "panels": [ + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 10, + "id": 6, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 0, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 4, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (instance) (\n rate(memcached_process_user_cpu_seconds_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]) +\n rate(memcached_process_system_cpu_seconds_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n)\n", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "CPU", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 10, + "id": 7, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 0, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 4, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (memcached_current_bytes{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Memory", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 10, + "id": 8, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 0, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 4, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (memcached_current_items{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Items", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Resources", + "titleSize": "h6" + }, + { + "collapse": false, + "height": "250px", + "panels": [ + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 9, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (memcached_current_connections{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + }, + { + "expr": "min(memcached_max_connections{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "Max Connections (min setting across all instances)", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Current Connections", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 10, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (rate(memcached_connections_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Connections / sec", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 11, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (rate(memcached_read_bytes_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Bytes received", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + }, + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 12, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by(instance) (rate(memcached_written_bytes_total{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{instance}}", + "legendLink": null + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Bytes transmitted", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Network", + "titleSize": "h6" + }, + { + "collapse": false, + "height": "250px", + "panels": [ + { + "aliasColors": { }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "fill": 1, + "id": 13, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [ ], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ ], + "spaceLength": 10, + "span": 12, + "stack": false, + "steppedLine": false, + "styles": [ + { + "alias": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "Count", + "colorMode": null, + "colors": [ ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTargetBlank": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #A", + "thresholds": [ ], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Uptime", + "colorMode": null, + "colors": [ ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTargetBlank": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #B", + "thresholds": [ ], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "Instance", + "colorMode": null, + "colors": [ ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTargetBlank": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "instance", + "thresholds": [ ], + "type": "number", + "unit": "short" + }, + { + "alias": "Job", + "colorMode": null, + "colors": [ ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTargetBlank": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "job", + "thresholds": [ ], + "type": "number", + "unit": "short" + }, + { + "alias": "Version", + "colorMode": null, + "colors": [ ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTargetBlank": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "version", + "thresholds": [ ], + "type": "number", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "/.*/", + "thresholds": [ ], + "type": "string", + "unit": "short" + } + ], + "targets": [ + { + "expr": "count by (job, instance, version) (memcached_version{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "A" + }, + { + "expr": "max by (job, instance) (memcached_uptime_seconds{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "B" + } + ], + "thresholds": [ ], + "timeFrom": null, + "timeShift": null, + "title": "Memcached Info", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "transform": "table", + "type": "table", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [ ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": 0, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ] + } + ], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": true, + "title": "Memcached Info", + "titleSize": "h6" + } + ], + "schemaVersion": 14, + "style": "dark", + "tags": [ ], + "templating": { + "list": [ + { + "current": { + "text": "default", + "value": "default" + }, + "hide": 0, + "label": "Data Source", + "name": "datasource", + "options": [ ], + "query": "prometheus", + "refresh": 1, + "regex": "", + "type": "datasource" + }, + { + "allValue": ".+", + "current": { + "selected": true, + "text": "All", + "value": "$__all" + }, + "datasource": "$datasource", + "hide": 0, + "includeAll": true, + "label": "cluster", + "multi": true, + "name": "cluster", + "options": [ ], + "query": "label_values(memcached_commands_total, cluster)", + "refresh": 1, + "regex": "", + "sort": 2, + "tagValuesQuery": "", + "tags": [ ], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".+", + "current": { + "selected": true, + "text": "All", + "value": "$__all" + }, + "datasource": "$datasource", + "hide": 0, + "includeAll": true, + "label": "job", + "multi": true, + "name": "job", + "options": [ ], + "query": "label_values(memcached_commands_total{cluster=~\"$cluster\"}, job)", + "refresh": 1, + "regex": "", + "sort": 2, + "tagValuesQuery": "", + "tags": [ ], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".+", + "current": { + "selected": true, + "text": "All", + "value": "$__all" + }, + "datasource": "$datasource", + "hide": 0, + "includeAll": true, + "label": "instance", + "multi": true, + "name": "instance", + "options": [ ], + "query": "label_values(memcached_commands_total{cluster=~\"$cluster\",job=~\"$job\"}, instance)", + "refresh": 1, + "regex": "", + "sort": 2, + "tagValuesQuery": "", + "tags": [ ], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, + "time": { + "from": "now-1h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "utc", + "title": "Memcached Overview", + "uid": "124d5222454213f748dbfaf69b77ec48", + "version": 0 +} \ No newline at end of file diff --git a/dependency/memcached/12.1.1/ix_values.yaml b/dependency/memcached/12.2.0/ix_values.yaml similarity index 64% rename from dependency/memcached/12.1.1/ix_values.yaml rename to dependency/memcached/12.2.0/ix_values.yaml index 9280299772a..9494849229e 100644 --- a/dependency/memcached/12.1.1/ix_values.yaml +++ b/dependency/memcached/12.2.0/ix_values.yaml @@ -12,5 +12,15 @@ service: portal: open: enabled: false + +configmap: + dashboard: + enabled: true + labels: + grafanadasboard: '1' + data: + memcached.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + manifestManager: enabled: false diff --git a/dependency/memcached/12.1.1/questions.yaml b/dependency/memcached/12.2.0/questions.yaml similarity index 100% rename from dependency/memcached/12.1.1/questions.yaml rename to dependency/memcached/12.2.0/questions.yaml diff --git a/dependency/memcached/12.1.1/templates/NOTES.txt b/dependency/memcached/12.2.0/templates/NOTES.txt similarity index 100% rename from dependency/memcached/12.1.1/templates/NOTES.txt rename to dependency/memcached/12.2.0/templates/NOTES.txt diff --git a/dependency/memcached/12.1.1/templates/common.yaml b/dependency/memcached/12.2.0/templates/common.yaml similarity index 100% rename from dependency/memcached/12.1.1/templates/common.yaml rename to dependency/memcached/12.2.0/templates/common.yaml diff --git a/dependency/memcached/12.1.1/values.yaml b/dependency/memcached/12.2.0/values.yaml similarity index 100% rename from dependency/memcached/12.1.1/values.yaml rename to dependency/memcached/12.2.0/values.yaml diff --git a/enterprise/blocky/13.1.0/charts/common-18.0.1.tgz b/enterprise/blocky/13.1.0/charts/common-18.0.1.tgz deleted file mode 100644 index 60d09f7506f..00000000000 Binary files a/enterprise/blocky/13.1.0/charts/common-18.0.1.tgz and /dev/null differ diff --git a/enterprise/blocky/13.1.0/.helmignore b/enterprise/blocky/13.2.0/.helmignore similarity index 100% rename from enterprise/blocky/13.1.0/.helmignore rename to enterprise/blocky/13.2.0/.helmignore diff --git a/enterprise/blocky/13.1.0/CHANGELOG.md b/enterprise/blocky/13.2.0/CHANGELOG.md similarity index 95% rename from enterprise/blocky/13.1.0/CHANGELOG.md rename to enterprise/blocky/13.2.0/CHANGELOG.md index 74bd867070b..bbda8c4766a 100644 --- a/enterprise/blocky/13.1.0/CHANGELOG.md +++ b/enterprise/blocky/13.2.0/CHANGELOG.md @@ -16,6 +16,10 @@ title: Changelog + + + + ## [blocky-12.2.7](https://github.com/truecharts/charts/compare/blocky-12.2.6...blocky-12.2.7) (2024-02-03) ### Chore @@ -93,7 +97,3 @@ title: Changelog ## [blocky-12.1.8](https://github.com/truecharts/charts/compare/blocky-12.1.7...blocky-12.1.8) (2024-01-02) ### Chore - - - -- update helm general non-major by renovate ([#16820](https://github.com/truecharts/charts/issues/16820)) diff --git a/enterprise/blocky/13.1.0/Chart.yaml b/enterprise/blocky/13.2.0/Chart.yaml similarity index 95% rename from enterprise/blocky/13.1.0/Chart.yaml rename to enterprise/blocky/13.2.0/Chart.yaml index 63458d13e01..b1ee790ff9b 100644 --- a/enterprise/blocky/13.1.0/Chart.yaml +++ b/enterprise/blocky/13.2.0/Chart.yaml @@ -10,7 +10,7 @@ apiVersion: v2 appVersion: 0.23.0 dependencies: - name: common - version: 18.0.1 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" @@ -30,7 +30,7 @@ icon: https://truecharts.org/img/hotlink-ok/chart-icons/blocky.png keywords: - dns - blocky -kubeVersion: '>=1.24.0-0' +kubeVersion: ">=1.24.0-0" maintainers: - name: TrueCharts email: info@truecharts.org @@ -41,7 +41,7 @@ sources: - https://0xerr0r.github.io/blocky/ - https://github.com/0xERR0R/blocky - https://github.com/truecharts/charts/tree/master/charts/enterprise/blocky - - https://quay.io/oriedge/k8s_gateway - https://hub.docker.com/r/spx01/blocky + - https://quay.io/oriedge/k8s_gateway type: application -version: 13.1.0 +version: 13.2.0 diff --git a/enterprise/blocky/13.1.0/LICENSE b/enterprise/blocky/13.2.0/LICENSE similarity index 100% rename from enterprise/blocky/13.1.0/LICENSE rename to enterprise/blocky/13.2.0/LICENSE diff --git a/enterprise/blocky/13.1.0/README.md b/enterprise/blocky/13.2.0/README.md similarity index 100% rename from enterprise/blocky/13.1.0/README.md rename to enterprise/blocky/13.2.0/README.md diff --git a/enterprise/blocky/13.1.0/app-readme.md b/enterprise/blocky/13.2.0/app-readme.md similarity index 100% rename from enterprise/blocky/13.1.0/app-readme.md rename to enterprise/blocky/13.2.0/app-readme.md diff --git a/enterprise/blocky/13.2.0/charts/common-18.0.3.tgz b/enterprise/blocky/13.2.0/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/enterprise/blocky/13.2.0/charts/common-18.0.3.tgz differ diff --git a/enterprise/blocky/13.1.0/charts/redis-11.2.1.tgz b/enterprise/blocky/13.2.0/charts/redis-11.2.1.tgz similarity index 100% rename from enterprise/blocky/13.1.0/charts/redis-11.2.1.tgz rename to enterprise/blocky/13.2.0/charts/redis-11.2.1.tgz diff --git a/enterprise/blocky/13.2.0/dashboard.json b/enterprise/blocky/13.2.0/dashboard.json new file mode 100644 index 00000000000..2000ebdfc7d --- /dev/null +++ b/enterprise/blocky/13.2.0/dashboard.json @@ -0,0 +1,1981 @@ +{ + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + }, + { + "name": "VAR_BLOCKY_URL", + "type": "constant", + "label": "blocky API URL", + "value": "", + "description": "" + } + ], + "__elements": [], + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "8.3.3" + }, + { + "type": "panel", + "id": "heatmap", + "name": "Heatmap", + "version": "" + }, + { + "type": "panel", + "id": "piechart", + "name": "Pie chart", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": null, + "iteration": 1641070862290, + "links": [ + { + "icon": "external link", + "tags": [], + "title": "blocky @ GitHub", + "tooltip": "open GitHub repo", + "type": "link", + "url": "https://github.com/0xERR0R/blocky" + } + ], + "liveNow": false, + "panels": [ + { + "description": "current service state", + "fieldConfig": { + "defaults": { + "mappings": [ + { + "options": { + "0": { + "text": "down" + }, + "1": { + "text": "up" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#d44a3a", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 1 + }, + { + "color": "#299c46", + "value": 1 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "id": 26, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": "sum(up{job=~\"$job\"})", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "State", + "transparent": true, + "type": "stat" + }, + { + "description": "Is blocking enabled?", + "fieldConfig": { + "defaults": { + "mappings": [ + { + "options": { + "0": { + "text": "off" + }, + "1": { + "text": "on" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#d44a3a", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 1 + }, + { + "color": "#299c46", + "value": 1 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 0 + }, + "id": 43, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "value" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": "blocky_blocking_enabled", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Blocking", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Enable Ad disable blocking", + "gridPos": { + "h": 5, + "w": 12, + "x": 12, + "y": 0 + }, + "id": 42, + "options": { + "content": "\n
\n ×Done!\n
\n
\n \n \n \n
\n\n\n", + "mode": "html" + }, + "pluginVersion": "8.3.3", + "title": "Blocking status", + "transparent": true, + "type": "text" + }, + { + "description": "Blocky [version](https://github.com/0xERR0R/blocky) number", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 0, + "y": 3 + }, + "id": 55, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "center", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "/^version$/", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "repeatDirection": "v", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": "blocky_build_info ", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Version", + "transformations": [ + { + "id": "labelsToFields", + "options": {} + }, + { + "id": "merge", + "options": {} + } + ], + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average query response time for all query types", + "fieldConfig": { + "defaults": { + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ms" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 3 + }, + "id": 24, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(increase(blocky_request_duration_ms_sum[$__range])) / sum(increase(blocky_request_duration_ms_count[$__range]))", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Avg response time", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of blacklist entries", + "fieldConfig": { + "defaults": { + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 12, + "y": 5 + }, + "id": 30, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(blocky_blacklist_cache) / sum(up{job=~\"$job\"})", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Blacklist entries total", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "decimals": 2, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 12 + }, + "id": 28, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(go_memstats_sys_bytes{job=~\"$job\"})/sum(up{job=~\"$job\"})", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Memory allocated", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Percentage of blocked queries", + "fieldConfig": { + "defaults": { + "decimals": 2, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "max": 1, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 6 + }, + "id": 34, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(increase(blocky_response_total{response_type=\"BLOCKED\"}[$__range])) / sum(increase(blocky_query_total[$__range])) ", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Queries blocked", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of all queries. Shows the last value", + "fieldConfig": { + "defaults": { + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 0, + "y": 6 + }, + "hideTimeOverride": true, + "id": 4, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "ceil(sum(increase(blocky_query_total[$__range]))) ", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Query Count Total", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of entries in the cache. Shows the last value", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 12, + "y": 8 + }, + "id": 45, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(blocky_cache_entry_count)/ sum(up{job=~\"$job\"})", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Cache entries count", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Cache Hit/Miss ratio. 100 % means, all queries could be answered from the cache, 0% - all queries must be resolved via external DNS", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "max": 1, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 18, + "y": 8 + }, + "id": 47, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(increase(blocky_cache_hit_count[$__range])) / (sum(increase(blocky_cache_hit_count[$__range])) + sum(increase(blocky_cache_miss_count[$__range])))", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Cache Hit/Miss ratio", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of occured errors", + "fieldConfig": { + "defaults": { + "decimals": 0, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 1 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 0, + "y": 12 + }, + "id": 36, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(increase(blocky_error_total[$__range]))", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Error count", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Amount of performed DNS queries to prefetch cached queries", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 0, + "y": 9 + }, + "id": 53, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "ceil(sum(increase(blocky_prefetch_count[$__range])))", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Prefetch count", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Amount of prefetch queries per minute", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 12, + "y": 11 + }, + "id": 51, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(rate(blocky_prefetch_count[5m])) * 60", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Prefetch rate per min", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "How many of cached entries were prefetched automatically", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "max": 1, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 18, + "y": 11 + }, + "id": 58, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(increase(blocky_prefetch_hit_count[$__range])) / (sum(increase(blocky_cache_hit_count[$__range])))", + "format": "table", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Prefetch Hit ratio", + "transparent": true, + "type": "stat" + }, + { + "description": "Time since last list refresh", + "fieldConfig": { + "defaults": { + "decimals": 0, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 18, + "y": 5 + }, + "id": 57, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": "sum(time() -blocky_last_list_group_refresh)/ sum(up{job=~\"$job\"})", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Last list refresh", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "uid": "${DS_PROMETHEUS}" + }, + "description": "Amount of unique domains in the prefetched cache", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 9 + }, + "id": 49, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(blocky_prefetch_domain_name_cache_count)/ sum(up{job=~\"$job\"})", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Prefetch domain count", + "transparent": true, + "type": "stat" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "avg requests / min", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 15 + }, + "id": 10, + "options": { + "legend": { + "calcs": [], + "displayMode": "hidden", + "placement": "bottom" + }, + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(rate(blocky_query_total[5m])) * 60", + "format": "time_series", + "instant": false, + "interval": "", + "legendFormat": " ", + "refId": "A" + } + ], + "title": "Request rate", + "transparent": true, + "type": "timeseries" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "avg requests / min", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "bars", + "fillOpacity": 100, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 22 + }, + "id": 52, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "8.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum by (client) (rate(blocky_query_total[5m])) * 60", + "format": "time_series", + "instant": false, + "interval": "", + "legendFormat": " {{client}}", + "refId": "A" + } + ], + "title": "Request rate per client", + "transparent": true, + "type": "timeseries" + }, + { + "cards": {}, + "color": { + "cardColor": "#FADE2A", + "colorScale": "sqrt", + "colorScheme": "interpolateYlOrBr", + "exponent": 0.5, + "mode": "opacity" + }, + "dataFormat": "tsbuckets", + "gridPos": { + "h": 9, + "w": 24, + "x": 0, + "y": 29 + }, + "heatmap": {}, + "hideZeroBuckets": false, + "highlightCards": true, + "id": 22, + "legend": { + "show": true + }, + "reverseYBuckets": false, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": true, + "expr": "sum(increase(blocky_request_duration_ms_bucket{response_type=\"RESOLVED\"}[$__range])) by (le)", + "format": "heatmap", + "instant": false, + "interval": "", + "legendFormat": "{{le}}", + "refId": "A" + } + ], + "title": "request duration (upstream)", + "tooltip": { + "show": true, + "showHistogram": false + }, + "transparent": true, + "type": "heatmap", + "xAxis": { + "show": true + }, + "yAxis": { + "format": "ms", + "logBase": 1, + "show": true + }, + "yBucketBound": "auto" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 0, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 38 + }, + "id": 2, + "links": [], + "maxDataPoints": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "values": [ + "value", + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "sum" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "6.6.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": " sort_desc(sum by (type) (ceil(increase(blocky_query_total[$__range]))))", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "{{ type }}", + "refId": "A" + } + ], + "title": "Query by type", + "transparent": true, + "type": "piechart" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 0, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 38 + }, + "id": 8, + "links": [], + "maxDataPoints": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "values": [ + "value", + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "6.6.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": "sort_desc(sum by (client) (ceil(increase(blocky_query_total[$__range]))))", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "{{ client }}", + "refId": "A" + } + ], + "title": "Query per Client", + "transparent": true, + "type": "piechart" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 0, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 46 + }, + "id": 32, + "links": [], + "maxDataPoints": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "values": [ + "value" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "6.6.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": "topk(1, blocky_blacklist_cache) by (group)", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "{{ group }}", + "refId": "A" + } + ], + "title": "Blacklist by group", + "transparent": true, + "type": "piechart" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 0, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 46 + }, + "id": 14, + "links": [], + "maxDataPoints": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "values": [ + "value", + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": " sort_desc(sum by (reason) (ceil(increase(blocky_response_total[$__range]))))", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "{{reason}}", + "refId": "A" + } + ], + "title": "Response Reasons", + "transparent": true, + "type": "piechart" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 0, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 54 + }, + "id": 38, + "interval": "", + "links": [], + "maxDataPoints": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "values": [ + "value", + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "sum" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": " sort_desc(sum by (response_type) (ceil(increase(blocky_response_total[$__range]))))", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "{{response_type}}", + "refId": "A" + } + ], + "title": "Response Type", + "transparent": true, + "type": "piechart" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "decimals": 0, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 54 + }, + "id": 12, + "links": [], + "maxDataPoints": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "values": [ + "value", + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "exemplar": false, + "expr": " sort_desc(sum by (response_code) (ceil(increase(blocky_response_total[$__range]))))", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "{{response_code}}", + "refId": "A" + } + ], + "title": "Response status", + "transparent": true, + "type": "piechart" + } + ], + "refresh": false, + "schemaVersion": 34, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "hide": 2, + "label": "blocky API URL", + "name": "blocky_url", + "query": "${VAR_BLOCKY_URL}", + "skipUrlSync": false, + "type": "constant", + "current": { + "value": "${VAR_BLOCKY_URL}", + "text": "${VAR_BLOCKY_URL}", + "selected": false + }, + "options": [ + { + "value": "${VAR_BLOCKY_URL}", + "text": "${VAR_BLOCKY_URL}", + "selected": false + } + ] + }, + { + "current": {}, + "datasource": { + "type": "prometheus" + }, + "definition": "label_values(blocky_blocking_enabled,job)", + "hide": 0, + "includeAll": true, + "label": "job", + "multi": false, + "name": "job", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(blocky_blocking_enabled,job)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + } + ] + }, + "time": { + "from": "now-3h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "blocky", + "uid": "JvOqE4gRk", + "version": 1, + "weekStart": "" +} \ No newline at end of file diff --git a/enterprise/blocky/13.1.0/ix_values.yaml b/enterprise/blocky/13.2.0/ix_values.yaml similarity index 97% rename from enterprise/blocky/13.1.0/ix_values.yaml rename to enterprise/blocky/13.2.0/ix_values.yaml index ab99e82e840..d568a413ddd 100644 --- a/enterprise/blocky/13.1.0/ix_values.yaml +++ b/enterprise/blocky/13.2.0/ix_values.yaml @@ -296,11 +296,21 @@ k8sgateway: options: - name: tls_servername value: cloudflare-dns.com + +configmap: + dashboard: + enabled: true + labels: + grafanadasboard: '1' + data: + blocky.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + metrics: main: # -- Enable and configure a Prometheus serviceMonitor for the chart under this key. # @default -- See values.yaml - enabled: false + enabled: true type: "servicemonitor" endpoints: - port: main @@ -322,6 +332,9 @@ metrics: # for: 5m # labels: # severity: critical + + + redis: enabled: true # CANNOT be defined in above yaml section @@ -342,4 +355,4 @@ cnpg: enabled: false user: blocky database: blocky -updated: true + diff --git a/enterprise/blocky/13.1.0/questions.yaml b/enterprise/blocky/13.2.0/questions.yaml similarity index 100% rename from enterprise/blocky/13.1.0/questions.yaml rename to enterprise/blocky/13.2.0/questions.yaml diff --git a/enterprise/blocky/13.1.0/templates/NOTES.txt b/enterprise/blocky/13.2.0/templates/NOTES.txt similarity index 100% rename from enterprise/blocky/13.1.0/templates/NOTES.txt rename to enterprise/blocky/13.2.0/templates/NOTES.txt diff --git a/enterprise/blocky/13.1.0/templates/_blockyConfig.tpl b/enterprise/blocky/13.2.0/templates/_blockyConfig.tpl similarity index 100% rename from enterprise/blocky/13.1.0/templates/_blockyConfig.tpl rename to enterprise/blocky/13.2.0/templates/_blockyConfig.tpl diff --git a/enterprise/blocky/13.1.0/templates/_k8sgateway.tpl b/enterprise/blocky/13.2.0/templates/_k8sgateway.tpl similarity index 100% rename from enterprise/blocky/13.1.0/templates/_k8sgateway.tpl rename to enterprise/blocky/13.2.0/templates/_k8sgateway.tpl diff --git a/enterprise/blocky/13.1.0/templates/common.yaml b/enterprise/blocky/13.2.0/templates/common.yaml similarity index 100% rename from enterprise/blocky/13.1.0/templates/common.yaml rename to enterprise/blocky/13.2.0/templates/common.yaml diff --git a/enterprise/blocky/13.1.0/values.yaml b/enterprise/blocky/13.2.0/values.yaml similarity index 100% rename from enterprise/blocky/13.1.0/values.yaml rename to enterprise/blocky/13.2.0/values.yaml diff --git a/enterprise/traefik/26.1.0/charts/common-18.0.1.tgz b/enterprise/traefik/26.1.0/charts/common-18.0.1.tgz deleted file mode 100644 index 60d09f7506f..00000000000 Binary files a/enterprise/traefik/26.1.0/charts/common-18.0.1.tgz and /dev/null differ diff --git a/enterprise/traefik/26.1.0/.helmignore b/enterprise/traefik/26.2.0/.helmignore similarity index 100% rename from enterprise/traefik/26.1.0/.helmignore rename to enterprise/traefik/26.2.0/.helmignore diff --git a/enterprise/traefik/26.1.0/CHANGELOG.md b/enterprise/traefik/26.2.0/CHANGELOG.md similarity index 94% rename from enterprise/traefik/26.1.0/CHANGELOG.md rename to enterprise/traefik/26.2.0/CHANGELOG.md index 82d6c01d365..828daefb0a8 100644 --- a/enterprise/traefik/26.1.0/CHANGELOG.md +++ b/enterprise/traefik/26.2.0/CHANGELOG.md @@ -22,6 +22,10 @@ title: Changelog + + + + ## [traefik-25.1.17](https://github.com/truecharts/charts/compare/traefik-25.1.16...traefik-25.1.17) (2024-02-12) ### Chore @@ -93,7 +97,4 @@ title: Changelog -- update container image common to v17.2.22[@e7c9056](https://github.com/e7c9056) by renovate ([#16986](https://github.com/truecharts/charts/issues/16986)) - - -## [traefik-25.1.9](https://github.com/truecharts/charts/compare/traefik-25.1.8...traefik-25.1.9) (2024-01-02) +- update container image common to v17.2.22[@e7c9056](https://github.com/e7c9056) by renovate ([#16986](https://github.com/truecharts/charts/issues/16986)) \ No newline at end of file diff --git a/enterprise/traefik/26.1.0/Chart.yaml b/enterprise/traefik/26.2.0/Chart.yaml similarity index 94% rename from enterprise/traefik/26.1.0/Chart.yaml rename to enterprise/traefik/26.2.0/Chart.yaml index f047fdd47a8..b567ea10dbe 100644 --- a/enterprise/traefik/26.1.0/Chart.yaml +++ b/enterprise/traefik/26.2.0/Chart.yaml @@ -10,7 +10,7 @@ apiVersion: v2 appVersion: 2.11.0 dependencies: - name: common - version: 18.0.1 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" @@ -23,7 +23,7 @@ icon: https://truecharts.org/img/hotlink-ok/chart-icons/traefik.png keywords: - traefik - ingress -kubeVersion: '>=1.24.0-0' +kubeVersion: ">=1.24.0-0" maintainers: - name: TrueCharts email: info@truecharts.org @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/enterprise/traefik - https://github.com/truecharts/containers/tree/master/apps/traefik type: application -version: 26.1.0 +version: 26.2.0 diff --git a/enterprise/traefik/26.1.0/README.md b/enterprise/traefik/26.2.0/README.md similarity index 100% rename from enterprise/traefik/26.1.0/README.md rename to enterprise/traefik/26.2.0/README.md diff --git a/enterprise/traefik/26.1.0/app-readme.md b/enterprise/traefik/26.2.0/app-readme.md similarity index 100% rename from enterprise/traefik/26.1.0/app-readme.md rename to enterprise/traefik/26.2.0/app-readme.md diff --git a/enterprise/traefik/26.2.0/charts/common-18.0.3.tgz b/enterprise/traefik/26.2.0/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/enterprise/traefik/26.2.0/charts/common-18.0.3.tgz differ diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_ingressroutes.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_ingressroutes.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_ingressroutes.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_ingressroutes.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_ingressroutetcps.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_ingressroutetcps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_ingressroutetcps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_ingressroutetcps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_ingressrouteudps.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_ingressrouteudps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_ingressrouteudps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_ingressrouteudps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_middlewares.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_middlewares.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_middlewares.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_middlewares.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_middlewaretcps.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_middlewaretcps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_middlewaretcps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_middlewaretcps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_serverstransports.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_serverstransports.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_serverstransports.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_serverstransports.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_tlsoptions.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_tlsoptions.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_tlsoptions.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_tlsoptions.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_tlsstores.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_tlsstores.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_tlsstores.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_tlsstores.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.containo.us_traefikservices.yaml b/enterprise/traefik/26.2.0/crds/traefik.containo.us_traefikservices.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.containo.us_traefikservices.yaml rename to enterprise/traefik/26.2.0/crds/traefik.containo.us_traefikservices.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_ingressroutes.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_ingressroutes.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_ingressroutes.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_ingressroutes.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_ingressroutetcps.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_ingressroutetcps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_ingressroutetcps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_ingressroutetcps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_ingressrouteudps.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_ingressrouteudps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_ingressrouteudps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_ingressrouteudps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_middlewares.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_middlewares.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_middlewares.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_middlewares.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_middlewaretcps.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_middlewaretcps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_middlewaretcps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_middlewaretcps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_serverstransports.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_serverstransports.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_serverstransports.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_serverstransports.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_serverstransporttcps.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_serverstransporttcps.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_serverstransporttcps.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_serverstransporttcps.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_tlsoptions.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_tlsoptions.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_tlsoptions.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_tlsoptions.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_tlsstores.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_tlsstores.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_tlsstores.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_tlsstores.yaml diff --git a/enterprise/traefik/26.1.0/crds/traefik.io_traefikservices.yaml b/enterprise/traefik/26.2.0/crds/traefik.io_traefikservices.yaml similarity index 100% rename from enterprise/traefik/26.1.0/crds/traefik.io_traefikservices.yaml rename to enterprise/traefik/26.2.0/crds/traefik.io_traefikservices.yaml diff --git a/enterprise/traefik/26.2.0/dashboard.json b/enterprise/traefik/26.2.0/dashboard.json new file mode 100644 index 00000000000..72f6a171e3a --- /dev/null +++ b/enterprise/traefik/26.2.0/dashboard.json @@ -0,0 +1,1613 @@ +{ + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "9.3.1" + }, + { + "type": "panel", + "id": "piechart", + "name": "Pie chart", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "description": "Official dashboard for Traefik on Kubernetes", + "editable": false, + "fiscalYearStartMonth": 0, + "gnetId": 17347, + "graphTooltip": 0, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 9, + "panels": [], + "title": "General", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 2, + "w": 5, + "x": 0, + "y": 1 + }, + "id": 13, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "count(traefik_config_reloads_total)", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Traefik Instances", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 7, + "x": 5, + "y": 1 + }, + "id": 7, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "sortBy": "Max", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sum(rate(traefik_entrypoint_requests_total{entrypoint=~\"$entrypoint\"}[1m])) by (entrypoint)", + "legendFormat": "{{entrypoint}}", + "range": true, + "refId": "A" + } + ], + "title": "Requests per Entrypoint", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "https://medium.com/@tristan_96324/prometheus-apdex-alerting-d17a065e39d0", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 1 + }, + "id": 6, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "sortBy": "Max", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "(sum(rate(traefik_entrypoint_request_duration_seconds_bucket{le=\"0.3\",code=\"200\",entrypoint=~\"$entrypoint\"}[5m])) by (method) + \n sum(rate(traefik_entrypoint_request_duration_seconds_bucket{le=\"1.2\",code=\"200\",entrypoint=~\"$entrypoint\"}[5m])) by (method)) / 2 / \n sum(rate(traefik_entrypoint_request_duration_seconds_count{code=\"200\",entrypoint=~\"$entrypoint\"}[5m])) by (method)\n", + "legendFormat": "{{method}}", + "range": true, + "refId": "A" + } + ], + "title": "Apdex score", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Mean Distribution", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 5, + "x": 0, + "y": 3 + }, + "id": 14, + "options": { + "legend": { + "displayMode": "list", + "placement": "right", + "showLegend": true, + "values": [ + "percent" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "multi", + "sort": "asc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sum(rate(traefik_service_requests_total{service=~\"$service.*\",protocol=\"http\"}[1m])) by (method, code)", + "legendFormat": "{{method}}[{{code}}]", + "range": true, + "refId": "A" + } + ], + "title": "Http Code ", + "type": "piechart" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 9 + }, + "id": 23, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n traefik_service_request_duration_seconds_sum{service=~\"$service.*\",protocol=\"http\"} / \n traefik_service_request_duration_seconds_count{service=~\"$service.*\",protocol=\"http\"},\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)\n\n", + "legendFormat": "{{method}}[{{code}}] on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Top slow services", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 9 + }, + "id": 5, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n sum by (service,code) \n (rate(traefik_service_requests_total{service=~\"$service.*\",protocol=\"http\"}[5m])) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)", + "legendFormat": "[{{code}}] on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Most requested services", + "type": "timeseries" + }, + { + "collapsed": true, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 11, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 18 + }, + "id": 3, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Max", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "label_replace(\n 1 - (sum by (service)\n (rate(traefik_service_request_duration_seconds_bucket{le=\"1.2\",service=~\"$service.*\"}[5m])) / sum by (service) \n (rate(traefik_service_request_duration_seconds_count{service=~\"$service.*\"}[5m]))\n ) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\"\n)", + "legendFormat": "{{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Services failing SLO of 1200ms", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 18 + }, + "id": 4, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Max", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "label_replace(\n 1 - (sum by (service)\n (rate(traefik_service_request_duration_seconds_bucket{le=\"0.3\",service=~\"$service.*\"}[5m])) / sum by (service) \n (rate(traefik_service_request_duration_seconds_count{service=~\"$service.*\"}[5m]))\n ) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\"\n)", + "legendFormat": "{{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Services failing SLO of 300ms", + "type": "timeseries" + } + ], + "title": "SLO", + "type": "row" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 18 + }, + "id": 16, + "panels": [], + "title": "HTTP Details", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { + "h": 12, + "w": 8, + "x": 0, + "y": 19 + }, + "id": 17, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n sum by (service,method,code) \n (rate(traefik_service_requests_total{service=~\"$service.*\",code=~\"2..\",protocol=\"http\"}[5m])) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)", + "legendFormat": "{{method}}[{{code}}] on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "2xx over 5 min", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisGridShow": true, + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { + "h": 12, + "w": 8, + "x": 8, + "y": 19 + }, + "id": 18, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n sum by (service,method,code) \n (rate(traefik_service_requests_total{service=~\"$service.*\",code=~\"5..\",protocol=\"http\"}[5m])) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)", + "legendFormat": "{{method}}[{{code}}] on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "5xx over 5 min", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisGridShow": true, + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "reqps" + }, + "overrides": [] + }, + "gridPos": { + "h": 12, + "w": 8, + "x": 16, + "y": 19 + }, + "id": 19, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n sum by (service,method,code) \n (rate(traefik_service_requests_total{service=~\"$service.*\",code!~\"2..|5..\",protocol=\"http\"}[5m])) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)", + "legendFormat": "{{method}}[{{code}}] on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Other codes over 5 min", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisGridShow": true, + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 31 + }, + "id": 20, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n sum by (service,method) \n (rate(traefik_service_requests_bytes_total{service=~\"$service.*\",protocol=\"http\"}[1m])) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)", + "legendFormat": "{{method}} on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Requests Size", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisGridShow": true, + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 31 + }, + "id": 24, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "topk(15,\n label_replace(\n sum by (service,method) \n (rate(traefik_service_responses_bytes_total{service=~\"$service.*\",protocol=\"http\"}[1m])) > 0,\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")\n)", + "legendFormat": "{{method}} on {{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Responses Size", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 39 + }, + "id": 2, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Max", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "label_replace(\n sum(traefik_service_open_connections{service=~\"$service.*\"}) by (service),\n \"service\", \"$1\", \"service\", \"([^-]+-[^-]+).*\")", + "legendFormat": "{{service}}", + "range": true, + "refId": "A" + } + ], + "title": "Connections per Service", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 39 + }, + "id": 21, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Max", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sum(traefik_entrypoint_open_connections{entrypoint=~\"$entrypoint\"}) by (entrypoint)\n", + "legendFormat": "{{entrypoint}}", + "range": true, + "refId": "A" + } + ], + "title": "Connections per Entrypoint", + "type": "timeseries" + } + ], + "refresh": false, + "schemaVersion": 37, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "Prometheus", + "value": "Prometheus" + }, + "hide": 0, + "includeAll": false, + "multi": false, + "name": "DS_PROMETHEUS", + "label": "datasource", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(traefik_entrypoint_open_connections, entrypoint)", + "hide": 0, + "includeAll": true, + "multi": false, + "name": "entrypoint", + "options": [], + "query": { + "query": "label_values(traefik_entrypoint_open_connections, entrypoint)", + "refId": "StandardVariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "label_values(traefik_service_open_connections, service)", + "hide": 0, + "includeAll": true, + "multi": false, + "name": "service", + "options": [], + "query": { + "query": "label_values(traefik_service_open_connections, service)", + "refId": "StandardVariableQuery" + }, + "refresh": 2, + "regex": "/([^-]+-[^-]+).*/", + "skipUrlSync": false, + "sort": 1, + "type": "query" + } + ] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "Traefik Official Kubernetes Dashboard", + "uid": "n5bu_kv4k", + "version": 6, + "weekStart": "" +} \ No newline at end of file diff --git a/enterprise/traefik/26.1.0/ix_values.yaml b/enterprise/traefik/26.2.0/ix_values.yaml similarity index 98% rename from enterprise/traefik/26.1.0/ix_values.yaml rename to enterprise/traefik/26.2.0/ix_values.yaml index 26c2803abc7..52f487857bd 100644 --- a/enterprise/traefik/26.1.0/ix_values.yaml +++ b/enterprise/traefik/26.2.0/ix_values.yaml @@ -119,14 +119,25 @@ logs: format: common metrics: main: - enabled: false + enabled: true type: servicemonitor endpoints: - port: metrics path: /metrics targetSelector: metrics + globalArguments: - "--global.checknewversion" + +configmap: + dashboard: + enabled: true + labels: + grafanadasboard: '1' + data: + traefik.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + ## # -- Additional arguments to be passed at Traefik's binary # All available options available on https://docs.traefik.io/reference/static-configuration/cli/ diff --git a/enterprise/traefik/26.1.0/questions.yaml b/enterprise/traefik/26.2.0/questions.yaml similarity index 100% rename from enterprise/traefik/26.1.0/questions.yaml rename to enterprise/traefik/26.2.0/questions.yaml diff --git a/enterprise/traefik/26.1.0/templates/NOTES.txt b/enterprise/traefik/26.2.0/templates/NOTES.txt similarity index 100% rename from enterprise/traefik/26.1.0/templates/NOTES.txt rename to enterprise/traefik/26.2.0/templates/NOTES.txt diff --git a/enterprise/traefik/26.1.0/templates/_args.tpl b/enterprise/traefik/26.2.0/templates/_args.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_args.tpl rename to enterprise/traefik/26.2.0/templates/_args.tpl diff --git a/enterprise/traefik/26.1.0/templates/_helpers.tpl b/enterprise/traefik/26.2.0/templates/_helpers.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_helpers.tpl rename to enterprise/traefik/26.2.0/templates/_helpers.tpl diff --git a/enterprise/traefik/26.1.0/templates/_ingressclass.tpl b/enterprise/traefik/26.2.0/templates/_ingressclass.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_ingressclass.tpl rename to enterprise/traefik/26.2.0/templates/_ingressclass.tpl diff --git a/enterprise/traefik/26.1.0/templates/_ingressroute.tpl b/enterprise/traefik/26.2.0/templates/_ingressroute.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_ingressroute.tpl rename to enterprise/traefik/26.2.0/templates/_ingressroute.tpl diff --git a/enterprise/traefik/26.1.0/templates/_portalhook.tpl b/enterprise/traefik/26.2.0/templates/_portalhook.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_portalhook.tpl rename to enterprise/traefik/26.2.0/templates/_portalhook.tpl diff --git a/enterprise/traefik/26.1.0/templates/_tlsoptions.tpl b/enterprise/traefik/26.2.0/templates/_tlsoptions.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_tlsoptions.tpl rename to enterprise/traefik/26.2.0/templates/_tlsoptions.tpl diff --git a/enterprise/traefik/26.1.0/templates/_tlsstore.tpl b/enterprise/traefik/26.2.0/templates/_tlsstore.tpl similarity index 100% rename from enterprise/traefik/26.1.0/templates/_tlsstore.tpl rename to enterprise/traefik/26.2.0/templates/_tlsstore.tpl diff --git a/enterprise/traefik/26.1.0/templates/common.yaml b/enterprise/traefik/26.2.0/templates/common.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/common.yaml rename to enterprise/traefik/26.2.0/templates/common.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/addPrefix.yaml b/enterprise/traefik/26.2.0/templates/middlewares/addPrefix.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/addPrefix.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/addPrefix.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/basic-middleware.yaml b/enterprise/traefik/26.2.0/templates/middlewares/basic-middleware.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/basic-middleware.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/basic-middleware.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/basicauth.yaml b/enterprise/traefik/26.2.0/templates/middlewares/basicauth.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/basicauth.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/basicauth.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/buffering.yaml b/enterprise/traefik/26.2.0/templates/middlewares/buffering.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/buffering.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/buffering.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/chain.yaml b/enterprise/traefik/26.2.0/templates/middlewares/chain.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/chain.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/chain.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/customFrameOptionsValue.yaml b/enterprise/traefik/26.2.0/templates/middlewares/customFrameOptionsValue.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/customFrameOptionsValue.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/customFrameOptionsValue.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/customRequestHeaders.yaml b/enterprise/traefik/26.2.0/templates/middlewares/customRequestHeaders.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/customRequestHeaders.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/customRequestHeaders.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/customResponseHeaders.yaml b/enterprise/traefik/26.2.0/templates/middlewares/customResponseHeaders.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/customResponseHeaders.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/customResponseHeaders.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/forwardauth.yaml b/enterprise/traefik/26.2.0/templates/middlewares/forwardauth.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/forwardauth.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/forwardauth.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/geoblock.yaml b/enterprise/traefik/26.2.0/templates/middlewares/geoblock.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/geoblock.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/geoblock.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/ipwhitelist.yaml b/enterprise/traefik/26.2.0/templates/middlewares/ipwhitelist.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/ipwhitelist.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/ipwhitelist.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/modsecurity.yaml b/enterprise/traefik/26.2.0/templates/middlewares/modsecurity.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/modsecurity.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/modsecurity.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/ratelimit.yaml b/enterprise/traefik/26.2.0/templates/middlewares/ratelimit.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/ratelimit.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/ratelimit.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/real-ip.yaml b/enterprise/traefik/26.2.0/templates/middlewares/real-ip.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/real-ip.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/real-ip.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/redirectScheme.yaml b/enterprise/traefik/26.2.0/templates/middlewares/redirectScheme.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/redirectScheme.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/redirectScheme.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/redirectregex.yaml b/enterprise/traefik/26.2.0/templates/middlewares/redirectregex.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/redirectregex.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/redirectregex.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/rewriteResponseHeaders.yaml b/enterprise/traefik/26.2.0/templates/middlewares/rewriteResponseHeaders.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/rewriteResponseHeaders.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/rewriteResponseHeaders.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/stripPrefixRegex.yaml b/enterprise/traefik/26.2.0/templates/middlewares/stripPrefixRegex.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/stripPrefixRegex.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/stripPrefixRegex.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/tc-chains.yaml b/enterprise/traefik/26.2.0/templates/middlewares/tc-chains.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/tc-chains.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/tc-chains.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/tc-headers.yaml b/enterprise/traefik/26.2.0/templates/middlewares/tc-headers.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/tc-headers.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/tc-headers.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/tc-nextcloud.yaml b/enterprise/traefik/26.2.0/templates/middlewares/tc-nextcloud.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/tc-nextcloud.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/tc-nextcloud.yaml diff --git a/enterprise/traefik/26.1.0/templates/middlewares/theme-park.yaml b/enterprise/traefik/26.2.0/templates/middlewares/theme-park.yaml similarity index 100% rename from enterprise/traefik/26.1.0/templates/middlewares/theme-park.yaml rename to enterprise/traefik/26.2.0/templates/middlewares/theme-park.yaml diff --git a/enterprise/traefik/26.1.0/values.yaml b/enterprise/traefik/26.2.0/values.yaml similarity index 100% rename from enterprise/traefik/26.1.0/values.yaml rename to enterprise/traefik/26.2.0/values.yaml diff --git a/operators/cert-manager/4.1.1/charts/cert-manager-v1.14.2.tgz b/operators/cert-manager/4.1.1/charts/cert-manager-v1.14.2.tgz deleted file mode 100644 index a72a5cfa344..00000000000 Binary files a/operators/cert-manager/4.1.1/charts/cert-manager-v1.14.2.tgz and /dev/null differ diff --git a/operators/cert-manager/4.1.1/charts/common-18.0.2.tgz b/operators/cert-manager/4.1.1/charts/common-18.0.2.tgz deleted file mode 100644 index 1588b1d05a1..00000000000 Binary files a/operators/cert-manager/4.1.1/charts/common-18.0.2.tgz and /dev/null differ diff --git a/operators/cert-manager/4.1.1/templates/crds.yaml b/operators/cert-manager/4.1.1/templates/crds.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/operators/cert-manager/4.1.1/.helmignore b/operators/cert-manager/4.1.5/.helmignore similarity index 100% rename from operators/cert-manager/4.1.1/.helmignore rename to operators/cert-manager/4.1.5/.helmignore diff --git a/operators/cert-manager/4.1.1/CHANGELOG.md b/operators/cert-manager/4.1.5/CHANGELOG.md similarity index 97% rename from operators/cert-manager/4.1.1/CHANGELOG.md rename to operators/cert-manager/4.1.5/CHANGELOG.md index 54e489741f0..5bc4f4ec672 100644 --- a/operators/cert-manager/4.1.1/CHANGELOG.md +++ b/operators/cert-manager/4.1.5/CHANGELOG.md @@ -19,6 +19,10 @@ title: Changelog + + + + ## [cert-manager-3.1.16](https://github.com/truecharts/charts/compare/cert-manager-3.1.15...cert-manager-3.1.16) (2024-02-12) ### Chore @@ -93,7 +97,4 @@ title: Changelog - update container image common to v17.2.22[@e7c9056](https://github.com/e7c9056) by renovate ([#16986](https://github.com/truecharts/charts/issues/16986)) -## [cert-manager-3.1.8](https://github.com/truecharts/charts/compare/cert-manager-3.1.7...cert-manager-3.1.8) (2024-01-02) - -### Chore - +## [cert-manager-3.1.8](https://github.com/truecharts/charts/compare/cert-manager-3.1.7...cert-manager-3.1.8) (2024-01-02) \ No newline at end of file diff --git a/operators/cert-manager/4.1.1/Chart.yaml b/operators/cert-manager/4.1.5/Chart.yaml similarity index 95% rename from operators/cert-manager/4.1.1/Chart.yaml rename to operators/cert-manager/4.1.5/Chart.yaml index ae8c44e0ec0..52921753c61 100644 --- a/operators/cert-manager/4.1.1/Chart.yaml +++ b/operators/cert-manager/4.1.5/Chart.yaml @@ -10,14 +10,14 @@ apiVersion: v2 appVersion: latest dependencies: - name: common - version: 18.0.2 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" tags: [] import-values: [] - name: cert-manager - version: v1.14.2 + version: v1.14.3 repository: https://charts.jetstack.io condition: "" alias: certmanager @@ -43,4 +43,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/operators/cert-manager - https://github.com/truecharts/containers/tree/master/apps/alpine type: application -version: 4.1.1 +version: 4.1.5 diff --git a/operators/cert-manager/4.1.1/README.md b/operators/cert-manager/4.1.5/README.md similarity index 100% rename from operators/cert-manager/4.1.1/README.md rename to operators/cert-manager/4.1.5/README.md diff --git a/operators/cert-manager/4.1.1/app-readme.md b/operators/cert-manager/4.1.5/app-readme.md similarity index 100% rename from operators/cert-manager/4.1.1/app-readme.md rename to operators/cert-manager/4.1.5/app-readme.md diff --git a/operators/cert-manager/4.1.5/charts/cert-manager-v1.14.3.tgz b/operators/cert-manager/4.1.5/charts/cert-manager-v1.14.3.tgz new file mode 100644 index 00000000000..7ef2a663597 Binary files /dev/null and b/operators/cert-manager/4.1.5/charts/cert-manager-v1.14.3.tgz differ diff --git a/operators/cert-manager/4.1.5/charts/common-18.0.3.tgz b/operators/cert-manager/4.1.5/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/operators/cert-manager/4.1.5/charts/common-18.0.3.tgz differ diff --git a/operators/cert-manager/4.1.5/dashboard.json b/operators/cert-manager/4.1.5/dashboard.json new file mode 100644 index 00000000000..3d92fd6f9b7 --- /dev/null +++ b/operators/cert-manager/4.1.5/dashboard.json @@ -0,0 +1,1254 @@ +{ + "_config": { + "certManagerCertExpiryDays": "21", + "certManagerJobLabel": "cert-manager", + "certManagerRunbookURLPattern": "https://github.com/imusmanmalik/cert-manager-mixin/blob/main/RUNBOOK.md#%s", + "dashboards": { + "certmanagerCertificateExpirationTimestampSecondsSelector": "", + "certmanagerCertificateReadyStatusSelector": "", + "certmanagerControllerSyncCallCountSelector": "", + "certmanagerHttpAcmeClientRequestCountSelector": "", + "certmanagerHttpAcmeClientRequestDurationSecondsCountSelector": "", + "certmanagerHttpAcmeClientRequestDurationSecondsSumSelector": "", + "clusterVariableSelector": "", + "containerCPUUsageSecondsTotalSelector": "container=\"cert-manager\"", + "containerCpuCfsPeriodsTotalSelector": "container=\"cert-manager\"", + "containerCpuCfsThrottledPeriodsTotalSelector": "container=\"cert-manager\"", + "containerMemoryUsageBytesSelector": "container=\"cert-manager\"", + "containerNetworkReceiveBytesTotalSelector": "namespace=\"cert-manager\"", + "containerNetworkTransmitBytesTotalSelector": "namespace=\"cert-manager\"", + "containerSelector": "container=\"cert-manager\"", + "defaultSelector": "", + "enableMultiCluster": false, + "kubePodContainerResourceLimitsCpuCoresSelector": "container=\"cert-manager\"", + "kubePodContainerResourceLimitsMemoryBytesSelector": "container=\"cert-manager\"", + "kubePodContainerResourceRequestsCpuCoresSelector": "container=\"cert-manager\"", + "kubePodContainerResourceRequestsMemoryBytesSelector": "container=\"cert-manager\"", + "namespaceSelector": "namespace=\"cert-manager\"" + }, + "grafanaExternalUrl": "https://grafana.example.com" + }, + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "description": "", + "editable": true, + "gnetId": null, + "graphTooltip": 1, + "id": 59, + "iteration": 1616445892702, + "links": [], + "panels": [ + { + "datasource": "$datasource", + "description": "The number of certificates in the ready state.", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 1 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "True" + }, + "properties": [ + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "text": {}, + "textMode": "auto" + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "expr": "sum by (condition) (certmanager_certificate_ready_status{ })", + "interval": "", + "legendFormat": "{ {condition } }", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Certificates Ready", + "type": "stat" + }, + { + "datasource": "$datasource", + "fieldConfig": { + "defaults": { + "custom": {}, + "decimals": 1, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 604800 + }, + { + "color": "green", + "value": 1209600 + } + ] + }, + "unit": "dtdurations" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 0 + }, + "id": 4, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "text": {}, + "textMode": "auto" + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "expr": "min(certmanager_certificate_expiration_timestamp_seconds{ } > 0) - time()", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "vector(1250000)", + "hide": true, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Soonest Cert Expiry", + "type": "stat" + }, + { + "datasource": "$datasource", + "description": "Status of the certificates. Values are True, False or Unknown.", + "fieldConfig": { + "defaults": { + "custom": { + "align": null, + "filterable": false + }, + "mappings": [ + { + "from": "", + "id": 0, + "operator": "", + "text": "Yes", + "to": "", + "type": 1, + "value": "" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Ready Status" + }, + "properties": [ + { + "id": "custom.width", + "value": 100 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Valid Until" + }, + "properties": [ + { + "id": "unit", + "value": "dateTimeAsIso" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Valid Until" + }, + "properties": [ + { + "id": "unit", + "value": "dateTimeAsIso" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 8 + }, + "id": 9, + "options": { + "showHeader": true, + "sortBy": [ + { + "desc": false, + "displayName": "Valid Until" + } + ] + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "expr": "label_join(avg by (name, namespace, condition, exported_namespace) (certmanager_certificate_ready_status{ } == 1), \"namespaced_name\", \"-\", \"namespace\", \"exported_namespace\", \"name\")", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "label_join(avg by (name, namespace, exported_namespace) (certmanager_certificate_expiration_timestamp_seconds{ }) * 1000, \"namespaced_name\", \"-\", \"namespace\", \"exported_namespace\", \"name\")", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Certificates", + "transformations": [ + { + "id": "seriesToColumns", + "options": { + "byField": "namespaced_name" + } + }, + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Time 1": true, + "Time 2": true, + "Value #A": true, + "exported_namespace": false, + "exported_namespace 1": false, + "exported_namespace 2": true, + "name 1": true, + "namespace 2": true, + "namespaced_name": true + }, + "indexByName": { + "Time 1": 8, + "Time 2": 10, + "Value #A": 6, + "Value #B": 5, + "condition": 4, + "exported_namespace 1": 1, + "exported_namespace 2": 11, + "name 1": 9, + "name 2": 3, + "namespace": 0, + "namespace 1": 2, + "namespaced_name": 7 + }, + "renameByName": { + "Time 1": "", + "Value #B": "Valid Until", + "condition": "Ready Status", + "exported_namespace": "Certificate Namespace", + "exported_namespace 1": "Certificate Namespace", + "exported_namespace 2": "", + "name": "Certificate", + "name 2": "Certificate", + "namespace": "Namespace", + "namespace 1": "Namespace", + "namespaced_name": "" + } + } + } + ], + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "The rate of controller sync requests.", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 8 + }, + "hiddenSeries": false, + "id": 7, + "interval": "20s", + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "maxDataPoints": 250, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (controller) (\n rate(certmanager_controller_sync_call_count{ }[$__rate_interval ])\n)", + "interval": "", + "legendFormat": "{ {controller } }", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Controller Sync Requests/sec", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "reqps", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "Rate of requests to ACME provider.", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 16 + }, + "hiddenSeries": false, + "id": 6, + "interval": "20s", + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "maxDataPoints": 250, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (method, path, status) (\n rate(certmanager_http_acme_client_request_count{ }[$__rate_interval ])\n)", + "interval": "", + "legendFormat": "{ {method } } { {path } } { {status } }", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "ACME HTTP Requests/sec", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "reqps", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "Average duration of requests to ACME provider. ", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 16 + }, + "hiddenSeries": false, + "id": 10, + "interval": "30s", + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "maxDataPoints": 250, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (method, path, status) (rate(certmanager_http_acme_client_request_duration_seconds_sum{ }[$__rate_interval ]))\n/\nsum by (method, path, status) (rate(certmanager_http_acme_client_request_duration_seconds_count{ }[$__rate_interval ]))", + "interval": "", + "legendFormat": "{ {method } } { {path } } { {status } }", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "ACME HTTP Request avg duration", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max": "dark-yellow" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "CPU Usage and limits, as percent of a vCPU core. ", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 6, + "x": 0, + "y": 24 + }, + "hiddenSeries": false, + "id": 12, + "interval": "1m", + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "maxDataPoints": 250, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "CPU", + "fill": 1, + "fillGradient": 5 + }, + { + "alias": "/Request.*/", + "color": "#FF9830", + "dashes": true + }, + { + "alias": "/Limit.*/", + "color": "#F2495C", + "dashes": true + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "avg by (pod) (rate(container_cpu_usage_seconds_total{container=\"cert-manager\" }[$__rate_interval ]))", + "format": "time_series", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "CPU { {pod } }", + "refId": "A" + }, + { + "expr": "avg by (pod) (kube_pod_container_resource_limits_cpu_cores{container=\"cert-manager\" })", + "format": "time_series", + "hide": true, + "interval": "", + "intervalFactor": 1, + "legendFormat": "Limit { {pod } }", + "refId": "B" + }, + { + "expr": "avg by (pod) (kube_pod_container_resource_requests_cpu_cores{container=\"cert-manager\" })", + "format": "time_series", + "hide": true, + "interval": "", + "intervalFactor": 1, + "legendFormat": "Request { {pod } }", + "refId": "C" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max": "dark-yellow" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "Percent of the time that the CPU is being throttled. Higher is badderer. ", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 6, + "x": 6, + "y": 24 + }, + "hiddenSeries": false, + "id": 14, + "interval": "1m", + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "maxDataPoints": 250, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "/external-dns.*/", + "fill": 1, + "fillGradient": 5 + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "avg by (pod) (\n rate(container_cpu_cfs_throttled_periods_total{container=\"cert-manager\" }[$__rate_interval ])\n /\n rate(container_cpu_cfs_periods_total{container=\"cert-manager\" }[$__rate_interval ])\n)", + "format": "time_series", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "{ {pod } }", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU Throttling", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max": "dark-yellow" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "Memory utilisation and limits.", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 6, + "x": 12, + "y": 24 + }, + "hiddenSeries": false, + "id": 16, + "interval": "1m", + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "maxDataPoints": 250, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "Memory", + "fill": 1, + "fillGradient": 5 + }, + { + "alias": "Request", + "color": "#FF9830", + "dashes": true + }, + { + "alias": "Limit", + "color": "#F2495C", + "dashes": true + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "avg by (pod) (container_memory_usage_bytes{container=\"cert-manager\" })", + "format": "time_series", + "hide": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "Memory { {pod } }", + "refId": "A" + }, + { + "expr": "avg by (pod) (kube_pod_container_resource_limits_memory_bytes{container=\"cert-manager\" })", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Limit { {pod } }", + "refId": "B" + }, + { + "expr": "avg by (pod) (kube_pod_container_resource_requests_memory_bytes{container=\"cert-manager\" })", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Request { {pod } }", + "refId": "C" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Memory", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max": "dark-yellow" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "description": "Network ingress/egress.", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 5, + "gridPos": { + "h": 8, + "w": 6, + "x": 18, + "y": 24 + }, + "hiddenSeries": false, + "id": 18, + "interval": "1m", + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.5", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "transmit", + "transform": "negative-Y" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "avg(\n sum without (interface) (\n rate(container_network_receive_bytes_total{namespace=\"cert-manager\" }[$__rate_interval ])\n )\n)", + "format": "time_series", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "receive", + "refId": "A" + }, + { + "expr": "avg(\n sum without (interface) (\n rate(container_network_transmit_bytes_total{namespace=\"cert-manager\" }[$__rate_interval ])\n )\n)", + "format": "time_series", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "transmit", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Network", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "refresh": "1m", + "schemaVersion": 27, + "style": "dark", + "tags": ["cert-manager", "infra"], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "prometheus", + "value": "prometheus" + }, + "description": null, + "error": null, + "hide": 0, + "includeAll": false, + "label": "Data Source", + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "queryValue": "", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "current": { + "selected": false, + "text": "", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, + "definition": "", + "hide": 2, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "query": "label_values(certmanager_certificate_ready_status{ }, cluster)", + "refId": "Prometheus-cluster-Variable-Query" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, + "time": { + "from": "now-24h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "Cert Manager", + "uid": "TvuRo2iMk", + "version": 1 +} diff --git a/operators/cert-manager/4.1.1/ix_values.yaml b/operators/cert-manager/4.1.5/ix_values.yaml similarity index 62% rename from operators/cert-manager/4.1.1/ix_values.yaml rename to operators/cert-manager/4.1.5/ix_values.yaml index 28b18caf84c..db665bbf8bd 100644 --- a/operators/cert-manager/4.1.1/ix_values.yaml +++ b/operators/cert-manager/4.1.5/ix_values.yaml @@ -1,5 +1,5 @@ image: - repository: tccr.io/tccr/alpine + repository: tccr.io/tccr/scratch pullPolicy: IfNotPresent tag: latest@sha256:ade0065e19edaa4f6903d464ee70605111a48394536deb94f31b661264704558 @@ -21,22 +21,23 @@ portal: operator: register: true +configmap: + dashboard: + enabled: true + labels: + grafanadasboard: '1' + data: + cert-manager.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + certmanager: dns01RecursiveNameservers: "1.1.1.1:53,1.0.0.1:53" dns01RecursiveNameserversOnly: false installCRDs: true enableCertificateOwnerRef: true + prometheus: + enabled: true + servicemonitor: + enabled: true -metrics: - main: - enabled: false - type: "podmonitor" - endpoints: - - port: main - interval: 5s - scrapeTimeout: 5s - path: / - honorLabels: false -manifestManager: - enabled: false diff --git a/operators/cert-manager/4.1.1/questions.yaml b/operators/cert-manager/4.1.5/questions.yaml similarity index 100% rename from operators/cert-manager/4.1.1/questions.yaml rename to operators/cert-manager/4.1.5/questions.yaml diff --git a/operators/cert-manager/4.1.1/templates/NOTES.txt b/operators/cert-manager/4.1.5/templates/NOTES.txt similarity index 100% rename from operators/cert-manager/4.1.1/templates/NOTES.txt rename to operators/cert-manager/4.1.5/templates/NOTES.txt diff --git a/operators/cert-manager/4.1.1/templates/common.yaml b/operators/cert-manager/4.1.5/templates/common.yaml similarity index 100% rename from operators/cert-manager/4.1.1/templates/common.yaml rename to operators/cert-manager/4.1.5/templates/common.yaml diff --git a/operators/cert-manager/4.1.1/values.yaml b/operators/cert-manager/4.1.5/values.yaml similarity index 100% rename from operators/cert-manager/4.1.1/values.yaml rename to operators/cert-manager/4.1.5/values.yaml diff --git a/operators/cloudnative-pg/6.1.0/charts/common-18.0.1.tgz b/operators/cloudnative-pg/6.1.0/charts/common-18.0.1.tgz deleted file mode 100644 index 60d09f7506f..00000000000 Binary files a/operators/cloudnative-pg/6.1.0/charts/common-18.0.1.tgz and /dev/null differ diff --git a/operators/cloudnative-pg/6.1.0/ix_values.yaml b/operators/cloudnative-pg/6.1.0/ix_values.yaml deleted file mode 100644 index 8ffafd21a48..00000000000 --- a/operators/cloudnative-pg/6.1.0/ix_values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -image: - repository: tccr.io/tccr/alpine - pullPolicy: IfNotPresent - tag: latest@sha256:ade0065e19edaa4f6903d464ee70605111a48394536deb94f31b661264704558 - -service: - main: - enabled: false - ports: - main: - enabled: false - -workload: - main: - enabled: false - -portal: - open: - enabled: false - -operator: - register: true - -manifestManager: - enabled: false diff --git a/operators/cloudnative-pg/6.1.0/.helmignore b/operators/cloudnative-pg/6.2.0/.helmignore similarity index 100% rename from operators/cloudnative-pg/6.1.0/.helmignore rename to operators/cloudnative-pg/6.2.0/.helmignore diff --git a/operators/cloudnative-pg/6.1.0/CHANGELOG.md b/operators/cloudnative-pg/6.2.0/CHANGELOG.md similarity index 98% rename from operators/cloudnative-pg/6.1.0/CHANGELOG.md rename to operators/cloudnative-pg/6.2.0/CHANGELOG.md index 65986e67eb2..73d303c2e80 100644 --- a/operators/cloudnative-pg/6.1.0/CHANGELOG.md +++ b/operators/cloudnative-pg/6.2.0/CHANGELOG.md @@ -15,6 +15,10 @@ title: Changelog + + + + ## [cloudnative-pg-5.2.16](https://github.com/truecharts/charts/compare/cloudnative-pg-5.2.15...cloudnative-pg-5.2.16) (2024-02-12) ### Chore @@ -93,7 +97,3 @@ title: Changelog ### Chore - - -- force bump to ensure up-to-date catalogs - diff --git a/operators/cloudnative-pg/6.1.0/Chart.yaml b/operators/cloudnative-pg/6.2.0/Chart.yaml similarity index 95% rename from operators/cloudnative-pg/6.1.0/Chart.yaml rename to operators/cloudnative-pg/6.2.0/Chart.yaml index cca8fb149ee..b4d4215dd98 100644 --- a/operators/cloudnative-pg/6.1.0/Chart.yaml +++ b/operators/cloudnative-pg/6.2.0/Chart.yaml @@ -10,7 +10,7 @@ apiVersion: v2 appVersion: latest dependencies: - name: common - version: 18.0.1 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" @@ -31,7 +31,7 @@ keywords: - database - cloudnative-pg - cnpg -kubeVersion: '>=1.24.0-0' +kubeVersion: ">=1.24.0-0" maintainers: - name: TrueCharts email: info@truecharts.org @@ -43,4 +43,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/operators/cloudnative-pg - https://github.com/truecharts/containers/tree/master/apps/alpine type: application -version: 6.1.0 +version: 6.2.0 diff --git a/operators/cloudnative-pg/6.1.0/README.md b/operators/cloudnative-pg/6.2.0/README.md similarity index 100% rename from operators/cloudnative-pg/6.1.0/README.md rename to operators/cloudnative-pg/6.2.0/README.md diff --git a/operators/cloudnative-pg/6.1.0/app-readme.md b/operators/cloudnative-pg/6.2.0/app-readme.md similarity index 100% rename from operators/cloudnative-pg/6.1.0/app-readme.md rename to operators/cloudnative-pg/6.2.0/app-readme.md diff --git a/operators/cloudnative-pg/6.1.0/charts/cloudnative-pg-0.20.1.tgz b/operators/cloudnative-pg/6.2.0/charts/cloudnative-pg-0.20.1.tgz similarity index 100% rename from operators/cloudnative-pg/6.1.0/charts/cloudnative-pg-0.20.1.tgz rename to operators/cloudnative-pg/6.2.0/charts/cloudnative-pg-0.20.1.tgz diff --git a/operators/cloudnative-pg/6.2.0/charts/common-18.0.3.tgz b/operators/cloudnative-pg/6.2.0/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/operators/cloudnative-pg/6.2.0/charts/common-18.0.3.tgz differ diff --git a/operators/cloudnative-pg/6.2.0/ix_values.yaml b/operators/cloudnative-pg/6.2.0/ix_values.yaml new file mode 100644 index 00000000000..ded30de0c7d --- /dev/null +++ b/operators/cloudnative-pg/6.2.0/ix_values.yaml @@ -0,0 +1,37 @@ +image: + repository: tccr.io/tccr/alpine + pullPolicy: IfNotPresent + tag: latest@sha256:ade0065e19edaa4f6903d464ee70605111a48394536deb94f31b661264704558 + +service: + main: + enabled: false + ports: + main: + enabled: false + +workload: + main: + enabled: false + +portal: + open: + enabled: false + +operator: + register: true + +cloudnative-pg: + monitoring: + # -- Specifies whether the monitoring should be enabled. Requires Prometheus Operator CRDs. + podMonitorEnabled: true + grafanaDashboard: + create: true + # -- Allows overriding the namespace where the ConfigMap will be created, defaulting to the same one as the Release. + namespace: "" + # -- The name of the ConfigMap containing the dashboard. + configMapName: "cnpg-grafana-dashboard" + # -- Label that ConfigMaps should have to be loaded as dashboards. + sidecarLabel: "grafana_dashboard" + # -- Label value that ConfigMaps should have to be loaded as dashboards. + sidecarLabelValue: "1" \ No newline at end of file diff --git a/operators/cloudnative-pg/6.1.0/questions.yaml b/operators/cloudnative-pg/6.2.0/questions.yaml similarity index 100% rename from operators/cloudnative-pg/6.1.0/questions.yaml rename to operators/cloudnative-pg/6.2.0/questions.yaml diff --git a/operators/cloudnative-pg/6.1.0/templates/NOTES.txt b/operators/cloudnative-pg/6.2.0/templates/NOTES.txt similarity index 100% rename from operators/cloudnative-pg/6.1.0/templates/NOTES.txt rename to operators/cloudnative-pg/6.2.0/templates/NOTES.txt diff --git a/operators/cloudnative-pg/6.1.0/templates/common.yaml b/operators/cloudnative-pg/6.2.0/templates/common.yaml similarity index 100% rename from operators/cloudnative-pg/6.1.0/templates/common.yaml rename to operators/cloudnative-pg/6.2.0/templates/common.yaml diff --git a/operators/cloudnative-pg/6.1.0/values.yaml b/operators/cloudnative-pg/6.2.0/values.yaml similarity index 100% rename from operators/cloudnative-pg/6.1.0/values.yaml rename to operators/cloudnative-pg/6.2.0/values.yaml diff --git a/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz b/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz index 49d11f75e17..293b6d75714 100644 Binary files a/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz and b/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz differ diff --git a/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz b/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz index 0ed34a86221..cb8db63ef2c 100644 Binary files a/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz and b/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz differ diff --git a/stable/prowlarr/15.1.1/charts/common-18.0.2.tgz b/stable/prowlarr/15.1.1/charts/common-18.0.2.tgz deleted file mode 100644 index 1588b1d05a1..00000000000 Binary files a/stable/prowlarr/15.1.1/charts/common-18.0.2.tgz and /dev/null differ diff --git a/stable/prowlarr/15.1.1/.helmignore b/stable/prowlarr/15.3.0/.helmignore similarity index 100% rename from stable/prowlarr/15.1.1/.helmignore rename to stable/prowlarr/15.3.0/.helmignore diff --git a/stable/prowlarr/15.1.1/CHANGELOG.md b/stable/prowlarr/15.3.0/CHANGELOG.md similarity index 95% rename from stable/prowlarr/15.1.1/CHANGELOG.md rename to stable/prowlarr/15.3.0/CHANGELOG.md index 6ad48eae15f..d20b62ac44e 100644 --- a/stable/prowlarr/15.1.1/CHANGELOG.md +++ b/stable/prowlarr/15.3.0/CHANGELOG.md @@ -13,6 +13,10 @@ title: Changelog + + + + ## [prowlarr-14.3.5](https://github.com/truecharts/charts/compare/prowlarr-14.3.4...prowlarr-14.3.5) (2024-02-12) ### Chore @@ -93,7 +97,3 @@ title: Changelog - update container image common to v17.2.26[@24c98f7](https://github.com/24c98f7) by renovate ([#17409](https://github.com/truecharts/charts/issues/17409)) - -## [prowlarr-14.2.4](https://github.com/truecharts/charts/compare/prowlarr-14.2.3...prowlarr-14.2.4) (2024-01-21) - -### Chore diff --git a/stable/prowlarr/15.1.1/Chart.yaml b/stable/prowlarr/15.3.0/Chart.yaml similarity index 94% rename from stable/prowlarr/15.1.1/Chart.yaml rename to stable/prowlarr/15.3.0/Chart.yaml index abf68601e82..c1e4dc81ba1 100644 --- a/stable/prowlarr/15.1.1/Chart.yaml +++ b/stable/prowlarr/15.3.0/Chart.yaml @@ -7,10 +7,10 @@ annotations: truecharts.org/min_helm_version: "3.12" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.13.3.4273 +appVersion: 1.14.0.4286 dependencies: - name: common - version: 18.0.2 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" @@ -37,4 +37,4 @@ sources: - https://ghcr.io/onedr0p/prowlarr-develop - https://ghcr.io/onedr0p/exportarr type: application -version: 15.1.1 +version: 15.3.0 diff --git a/stable/prowlarr/15.1.1/README.md b/stable/prowlarr/15.3.0/README.md similarity index 100% rename from stable/prowlarr/15.1.1/README.md rename to stable/prowlarr/15.3.0/README.md diff --git a/stable/prowlarr/15.1.1/app-readme.md b/stable/prowlarr/15.3.0/app-readme.md similarity index 100% rename from stable/prowlarr/15.1.1/app-readme.md rename to stable/prowlarr/15.3.0/app-readme.md diff --git a/stable/prowlarr/15.3.0/charts/common-18.0.3.tgz b/stable/prowlarr/15.3.0/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/stable/prowlarr/15.3.0/charts/common-18.0.3.tgz differ diff --git a/stable/prowlarr/15.3.0/dashboard.json b/stable/prowlarr/15.3.0/dashboard.json new file mode 100644 index 00000000000..eccef1fb1a8 --- /dev/null +++ b/stable/prowlarr/15.3.0/dashboard.json @@ -0,0 +1,1646 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": 267, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 1, + "text": "Down" + }, + "1": { + "color": "green", + "index": 0, + "text": "Up" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 3, + "x": 0, + "y": 0 + }, + "id": 34, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": {}, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "prowlarr_system_status{instance=~\"${prowlarr_instance}\"}", + "instant": true, + "legendFormat": "Status", + "range": false, + "refId": "A" + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 1, + "text": "Down" + }, + "1": { + "color": "green", + "index": 0, + "text": "Up" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "semi-dark-orange", + "value": 600 + }, + { + "color": "yellow", + "value": 3600 + }, + { + "color": "green", + "value": 86400 + } + ] + }, + "unit": "s", + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 3, + "x": 3, + "y": 0 + }, + "id": 35, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": {}, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "time() - container_start_time_seconds{container=\"prowlarr\"}", + "instant": true, + "legendFormat": "Uptime", + "range": false, + "refId": "A" + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-BlPu" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Health Issues" + }, + "properties": [ + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "yellow", + "value": 1 + }, + { + "color": "red", + "value": 2 + } + ] + } + }, + { + "id": "color" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Disabled Indexers" + }, + "properties": [ + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 1 + } + ] + } + }, + { + "id": "color" + } + ] + } + ] + }, + "gridPos": { + "h": 4, + "w": 5, + "x": 6, + "y": 0 + }, + "id": 37, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": { + "valueSize": 60 + }, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "expr": "max(prowlarr_system_health_issues{instance=~\"${prowlarr_instance}\"})", + "hide": false, + "legendFormat": "Health Issues", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "expr": "max(prowlarr_indexer_enabled_total{instance=~\"${prowlarr_instance}\"})", + "hide": false, + "legendFormat": "Enabled Indexers", + "range": true, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "expr": "max(prowlarr_indexer_total{instance=~\"${prowlarr_instance}\"} - prowlarr_indexer_enabled_total{instance=~\"${prowlarr_instance}\"})", + "hide": false, + "legendFormat": "Disabled Indexers", + "range": true, + "refId": "D" + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-BlPu" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Query Failures" + }, + "properties": [ + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "yellow", + "value": 15 + }, + { + "color": "red", + "value": 100 + } + ] + } + }, + { + "id": "color" + } + ] + } + ] + }, + "gridPos": { + "h": 4, + "w": 6, + "x": 11, + "y": 0 + }, + "id": 36, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": {}, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_indexer_queries_total{instance=~\"${prowlarr_instance}\"}[$__range]))", + "hide": false, + "instant": true, + "legendFormat": "Queries", + "range": false, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_indexer_grabs_total{instance=~\"${prowlarr_instance}\"}[$__range]))", + "hide": false, + "instant": true, + "legendFormat": "Grabs", + "range": false, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_indexer_failed_queries_total{instance=~\"${prowlarr_instance}\"}[$__range]))", + "hide": false, + "instant": true, + "legendFormat": "Query Failures", + "range": false, + "refId": "D" + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-BlPu" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Response Time" + }, + "properties": [ + { + "id": "unit", + "value": "ms" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Failed Queries" + }, + "properties": [ + { + "id": "unit", + "value": "percentunit" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "yellow", + "value": 0.1 + }, + { + "color": "red", + "value": 0.2 + } + ] + } + }, + { + "id": "color" + } + ] + } + ] + }, + "gridPos": { + "h": 4, + "w": 4, + "x": 17, + "y": 0 + }, + "id": 38, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": {}, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "avg(prowlarr_indexer_average_response_time_ms{instance=~\"${prowlarr_instance}\"})", + "hide": false, + "instant": true, + "legendFormat": "Response Time", + "range": false, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_indexer_failed_queries_total{instance=~\"${prowlarr_instance}\"}[$__range])) / sum(prowlarr_indexer_queries_total{instance=~\"${prowlarr_instance}\"})", + "hide": false, + "instant": true, + "legendFormat": "Failed Queries", + "range": false, + "refId": "D" + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "yellow", + "value": 604800 + }, + { + "color": "green", + "value": 2592000 + } + ] + }, + "unit": "none", + "unitScale": true + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Nearest VIP Expiration" + }, + "properties": [ + { + "id": "unit", + "value": "s" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Disk Used" + }, + "properties": [ + { + "id": "unit", + "value": "bytes" + } + ] + } + ] + }, + "gridPos": { + "h": 4, + "w": 3, + "x": 21, + "y": 0 + }, + "id": 39, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": {}, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "expr": "min(prowlarr_indexer_vip_expires_in_seconds)", + "hide": false, + "legendFormat": "Nearest VIP Expiration", + "range": true, + "refId": "D" + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ms", + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 4 + }, + "id": 44, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "expr": "max(prowlarr_indexer_average_response_time_ms{instance=~\"${prowlarr_instance}\"}) by (indexer)", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Indexer Latency", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ms", + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 4 + }, + "id": 45, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "expr": "max(increase(prowlarr_user_agent_queries_total{instance=~\"${prowlarr_instance}\"}[$__rate_interval])) by (user_agent)", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "User Agent Queries", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 6, + "x": 0, + "y": 13 + }, + "id": 29, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_indexer_queries_total{instance=~\"${prowlarr_instance}\"}[$__range])) by (indexer)\n", + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Queries by Indexer", + "type": "piechart" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 6, + "x": 6, + "y": 13 + }, + "id": 33, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_indexer_grabs_total{instance=~\"${prowlarr_instance}\"}[$__range])) by (indexer)", + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "A" + } + ], + "title": "Grabs by Indexer", + "type": "piechart" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 6, + "x": 12, + "y": 13 + }, + "id": 30, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent" + ] + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_user_agent_queries_total{instance=~\"${prowlarr_instance}\"}[$__range])) by (user_agent)\n", + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Queries by User Agent", + "type": "piechart" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unitScale": true + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 6, + "x": 18, + "y": 13 + }, + "id": 32, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "pieType": "donut", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(increase(prowlarr_user_agent_grabs_total{instance=~\"${prowlarr_instance}\"}[$__range])) by (user_agent)", + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "A" + } + ], + "title": "Grabs by User Agent", + "type": "piechart" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unitScale": true + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Expires In" + }, + "properties": [ + { + "id": "unit", + "value": "s" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "yellow", + "value": 604800 + }, + { + "color": "green", + "value": 2592000 + } + ] + } + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-text" + } + }, + { + "id": "custom.width", + "value": 150 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Expiration Date" + }, + "properties": [ + { + "id": "unit", + "value": "dateTimeAsLocal" + }, + { + "id": "custom.width", + "value": 250 + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 22 + }, + "id": 41, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "frameIndex": 1, + "showHeader": true, + "sortBy": [ + { + "desc": false, + "displayName": "indexer" + } + ] + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "prowlarr_indexer_vip_expires_in_seconds{instance=~\"${prowlarr_instance}\"}", + "format": "table", + "hide": false, + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "(time() * 1000) + (prowlarr_indexer_vip_expires_in_seconds{instance=~\"${prowlarr_instance}\"} * 1000)", + "format": "table", + "hide": false, + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "B" + } + ], + "title": "VIP Expiration", + "transformations": [ + { + "id": "concatenate", + "options": {} + }, + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "cluster": true, + "cluster 1": true, + "cluster 2": true, + "endpoint": true, + "endpoint 1": true, + "endpoint 2": true, + "indexer 2": true, + "instance": true, + "instance 1": true, + "instance 2": true, + "job": true, + "job 1": true, + "job 2": true, + "namespace": true, + "namespace 1": true, + "namespace 2": true, + "pod": true, + "pod 1": true, + "pod 2": true, + "prometheus": true, + "prometheus 1": true, + "prometheus 2": true, + "service": true, + "service 1": true, + "service 2": true, + "url": true, + "url 1": true, + "url 2": true + }, + "indexByName": { + "Time": 0, + "Value #A": 12, + "Value #B": 13, + "__name__": 1, + "cluster 1": 2, + "cluster 2": 14, + "endpoint 1": 3, + "endpoint 2": 15, + "indexer 1": 4, + "indexer 2": 16, + "instance 1": 5, + "instance 2": 17, + "job 1": 6, + "job 2": 18, + "namespace 1": 7, + "namespace 2": 19, + "pod 1": 8, + "pod 2": 20, + "prometheus 1": 9, + "prometheus 2": 21, + "service 1": 10, + "service 2": 22, + "url 1": 11, + "url 2": 23 + }, + "renameByName": { + "Value": "Expires In", + "Value #A": "Expires In", + "Value #B": "Expiration Date" + } + } + } + ], + "type": "table" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unitScale": true + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Expires In" + }, + "properties": [ + { + "id": "unit", + "value": "s" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Expiration Date" + }, + "properties": [ + { + "id": "unit", + "value": "dateTimeAsUS" + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 22 + }, + "id": 42, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "frameIndex": 1, + "showHeader": true + }, + "pluginVersion": "10.3.3", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "editorMode": "code", + "exemplar": false, + "expr": "prowlarr_system_health_issues{instance=~\"${prowlarr_instance}\"}", + "format": "table", + "hide": false, + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "A" + } + ], + "title": "System Health Issues", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "cluster": true, + "cluster 1": true, + "cluster 2": true, + "endpoint": true, + "endpoint 1": true, + "endpoint 2": true, + "indexer 2": true, + "instance": true, + "instance 1": true, + "instance 2": true, + "job": true, + "job 1": true, + "job 2": true, + "namespace": true, + "namespace 1": true, + "namespace 2": true, + "pod": true, + "pod 1": true, + "pod 2": true, + "prometheus": true, + "prometheus 1": true, + "prometheus 2": true, + "service": true, + "service 1": true, + "service 2": true, + "source": true, + "type": true, + "url": true, + "url 1": true, + "url 2": true + }, + "indexByName": {}, + "renameByName": { + "Value": "", + "Value #A": "Expires In", + "Value #B": "Expiration Date" + } + } + } + ], + "type": "table" + } + ], + "refresh": "30s", + "revision": 1, + "schemaVersion": 39, + "tags": [ + "prowlarr", + "music", + "movies", + "tv", + "media" + ], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "Prometheus", + "value": "prom" + }, + "hide": 0, + "includeAll": false, + "label": "Datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "queryValue": "", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": { + "type": "prometheus", + "uid": "prom" + }, + "definition": "label_values({__name__=~\"prowlarr_.*\"},instance)", + "hide": 0, + "includeAll": true, + "label": "Prowlarr Instance", + "multi": true, + "name": "prowlarr_instance", + "options": [], + "query": { + "query": "label_values({__name__=~\"prowlarr_.*\"},instance)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + } + ] + }, + "time": { + "from": "now-24h", + "to": "now" + }, + "timepicker": {}, + "timezone": "browser", + "title": "Prowlarr", + "uid": "WURH98Y4k1", + "version": 3, + "weekStart": "" +} \ No newline at end of file diff --git a/stable/prowlarr/15.1.1/ix_values.yaml b/stable/prowlarr/15.3.0/ix_values.yaml similarity index 91% rename from stable/prowlarr/15.1.1/ix_values.yaml rename to stable/prowlarr/15.3.0/ix_values.yaml index c64fc12bbd8..9448a776cc5 100644 --- a/stable/prowlarr/15.1.1/ix_values.yaml +++ b/stable/prowlarr/15.3.0/ix_values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/onedr0p/prowlarr-develop - tag: 1.13.3.4273@sha256:ca264d9629d35fef799c403fa1fe0625de6dabf6aec08d43ca981867ca8810c2 + tag: 1.14.0.4286@sha256:91dc4b0e5abf134fa73085f639500fe58a19ee61d6ed710a1dec50eb6463612d pullPolicy: IfNotPresent exportarrImage: repository: ghcr.io/onedr0p/exportarr @@ -91,6 +91,14 @@ persistence: exportarr: mountPath: /config readOnly: true +configmap: + dashboard: + enabled: true + labels: + grafanadasboard: '1' + data: + prowlarr.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} metrics: main: enabled: true diff --git a/stable/prowlarr/15.1.1/questions.yaml b/stable/prowlarr/15.3.0/questions.yaml similarity index 100% rename from stable/prowlarr/15.1.1/questions.yaml rename to stable/prowlarr/15.3.0/questions.yaml diff --git a/stable/prowlarr/15.1.1/templates/NOTES.txt b/stable/prowlarr/15.3.0/templates/NOTES.txt similarity index 100% rename from stable/prowlarr/15.1.1/templates/NOTES.txt rename to stable/prowlarr/15.3.0/templates/NOTES.txt diff --git a/stable/prowlarr/15.1.1/templates/common.yaml b/stable/prowlarr/15.3.0/templates/common.yaml similarity index 100% rename from stable/prowlarr/15.1.1/templates/common.yaml rename to stable/prowlarr/15.3.0/templates/common.yaml diff --git a/stable/prowlarr/15.1.1/values.yaml b/stable/prowlarr/15.3.0/values.yaml similarity index 100% rename from stable/prowlarr/15.1.1/values.yaml rename to stable/prowlarr/15.3.0/values.yaml