Skip to content

Commit 72772af

Browse files
committed
feat: [#428] upgrade default Grafana image to 12.4.2
- update domain config and code references - align source examples and tests - mark Grafana remediation subtask complete
1 parent 8fef8ac commit 72772af

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

docs/issues/428-docker-vulnerability-analysis-apr8-2026.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ For each image, execute these steps in order:
113113
#### 7. Grafana (`grafana/grafana:12.3.1`)
114114

115115
- [x] Analysis and triage completed
116-
- [ ] Easy remediation implemented (if available)
116+
- [x] Easy remediation implemented (if available)
117117
- [ ] Image rebuilt and validated
118118
- [ ] Trivy re-scan completed and compared
119119
- [ ] Scan docs updated

src/application/command_handlers/show/info/docker_images.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub struct DockerImagesInfo {
1515
/// Prometheus Docker image reference (e.g. `prom/prometheus:v3.5.1`), present when configured
1616
pub prometheus: Option<String>,
1717

18-
/// Grafana Docker image reference (e.g. `grafana/grafana:12.3.1`), present when configured
18+
/// Grafana Docker image reference (e.g. `grafana/grafana:12.4.2`), present when configured
1919
pub grafana: Option<String>,
2020
}
2121

src/domain/grafana/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::shared::secrets::Password;
1313
pub const GRAFANA_DOCKER_IMAGE_REPOSITORY: &str = "grafana/grafana";
1414

1515
/// Docker image tag for the Grafana container
16-
pub const GRAFANA_DOCKER_IMAGE_TAG: &str = "12.3.1";
16+
pub const GRAFANA_DOCKER_IMAGE_TAG: &str = "12.4.2";
1717

1818
/// Grafana metrics visualization configuration
1919
///
@@ -124,7 +124,7 @@ impl GrafanaConfig {
124124
/// use torrust_tracker_deployer_lib::domain::grafana::GrafanaConfig;
125125
///
126126
/// let image = GrafanaConfig::docker_image();
127-
/// assert_eq!(image.full_reference(), "grafana/grafana:12.3.1");
127+
/// assert_eq!(image.full_reference(), "grafana/grafana:12.4.2");
128128
/// ```
129129
#[must_use]
130130
pub fn docker_image() -> DockerImage {

src/infrastructure/templating/docker_compose/template/wrappers/docker_compose/context/grafana.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use super::service_topology::ServiceTopology;
1818
/// Uses `ServiceTopology` to share the common topology structure with other services.
1919
#[derive(Serialize, Debug, Clone)]
2020
pub struct GrafanaServiceContext {
21-
/// Docker image reference (e.g. `grafana/grafana:12.3.1`)
21+
/// Docker image reference (e.g. `grafana/grafana:12.4.2`)
2222
pub image: String,
2323

2424
/// Service topology (ports and networks)

src/shared/docker_image.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ mod tests {
135135

136136
#[test]
137137
fn it_should_implement_equality() {
138-
let a = DockerImage::new("grafana/grafana", "12.3.1");
139-
let b = DockerImage::new("grafana/grafana", "12.3.1");
138+
let a = DockerImage::new("grafana/grafana", "12.4.2");
139+
let b = DockerImage::new("grafana/grafana", "12.4.2");
140140
let c = DockerImage::new("grafana/grafana", "11.4.0");
141141

142142
assert_eq!(a, b);

0 commit comments

Comments
 (0)