Skip to content

Commit e5de922

Browse files
committed
Remove the exporter.enabled feature for this drop. We'll always inject our own mysql exporter
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent bf39def commit e5de922

13 files changed

+0
-13
lines changed

charts/feature-integrations/docs/integrations/mysql.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
| exporter.dataSource.host | string | `""` | The MySQL host to connect to. |
1818
| exporter.dataSource.port | int | `3306` | The MySQL port to connect to. |
1919
| exporter.dataSourceName | string | `""` | The data source string to use for the MySQL Exporter. |
20-
| exporter.enabled | bool | `true` | Whether to enable the Alloy-embedded MySQL Exporter. |
2120

2221
### Logs Settings
2322

charts/feature-integrations/integrations/mysql-values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ logs:
1717

1818
# Settings for the Alloy embedded MySQL Exporter
1919
exporter:
20-
# -- Whether to enable the Alloy-embedded MySQL Exporter.
21-
# @section -- Exporter Settings
22-
enabled: true
23-
2420
# -- The data source string to use for the MySQL Exporter.
2521
# @section -- Exporter Settings
2622
dataSourceName: ""

charts/feature-integrations/schema-mods/definitions/mysql-integration.schema.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
},
4747
"dataSourceName": {
4848
"type": "string"
49-
},
50-
"enabled": {
51-
"type": "boolean"
5249
}
5350
}
5451
},

charts/feature-integrations/templates/_integration_mysql_metrics.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ declare "mysql_integration" {
1414
{{- define "integrations.mysql.include.metrics" }}
1515
{{- $defaultValues := "integrations/mysql-values.yaml" | .Files.Get | fromYaml }}
1616
{{- with merge .instance $defaultValues (dict "type" "integration.mysql") }}
17-
{{- if .exporter.enabled }}
1817
{{- if eq (include "secrets.usesKubernetesSecret" .) "true" }}
1918
{{- include "secret.alloy" (deepCopy $ | merge (dict "object" .)) | nindent 0 }}
2019
{{- end }}
@@ -71,7 +70,6 @@ prometheus.relabel {{ include "helper.alloy_name" .name | quote }} {
7170
regex = {{ $metricDenyList | join "|" | quote }}
7271
action = "drop"
7372
}
74-
{{- end }}
7573
{{- end }}
7674
forward_to = argument.metrics_destinations.value
7775
}

charts/feature-integrations/values.schema.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@
253253
},
254254
"dataSourceName": {
255255
"type": "string"
256-
},
257-
"enabled": {
258-
"type": "boolean"
259256
}
260257
}
261258
},
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)