feat: [#246] implement Phase 2 Docker Compose integration for Grafana slice

This commit completes Phase 2 of the Grafana slice implementation, adding
Docker Compose service configuration and template rendering support.

Changes:

**Docker Compose Integration:**
- Extended DockerComposeContext with grafana_config field and with_grafana() builder
- Extended EnvContext with GrafanaServiceConfig and with_grafana() method
- Added conditional Grafana service to docker-compose.yml.tera template
  - Image: grafana/grafana:11.4.0
  - Port mapping: 3100:3000
  - Named volume: grafana_data
  - Depends on: prometheus
- Added Grafana environment variables to .env.tera template
  - GF_SECURITY_ADMIN_USER
  - GF_SECURITY_ADMIN_PASSWORD

**Environment Model:**
- Added grafana_config() getter methods to Environment and EnvironmentContext
- Re-exported GrafanaConfig from domain::environment module

**Rendering Step:**
- Extended RenderDockerComposeTemplatesStep with apply_grafana_config() method
- Extended with apply_grafana_env_context() to expose secrets for templates
- Properly exposes Password secrets for Tera template rendering

**Code Quality:**
- Refactored long namespace paths to use proper imports at module top
- All 1554 unit tests passing
- E2E infrastructure and deployment tests passing

**Issue Progress:**
- Updated issue checklist marking Phase 1 and Phase 2 tasks complete
- Phase 3 (Firewall & Testing) remains pending

Phase 2 follows the established pattern from Prometheus slice implementation
and maintains consistency with the project's architecture and conventions.

Author: josecelano

docs/issues/246-grafana-slice-release-run-commands.md

@@ -507,37 +507,37 @@ fn create_environment_from_config(config: UserInputs) -> Result<Environment, Con
 
 1. **Domain Layer** (`src/domain/grafana/`):
 
-   - [ ] Create `src/domain/grafana/mod.rs` module
-   - [ ] Create `src/domain/grafana/config.rs` with `GrafanaConfig` struct
-   - [ ] Add `admin_user` and `admin_password` fields (both String)
-   - [ ] Implement `Default` trait with default values ("admin"/"admin")
-   - [ ] Add `Serialize`, `Deserialize`, `Debug`, `Clone`, `PartialEq` derives
-   - [ ] Add comprehensive unit tests (5+ tests covering defaults, serialization, deserialization)
+   - [x] Create `src/domain/grafana/mod.rs` module
+   - [x] Create `src/domain/grafana/config.rs` with `GrafanaConfig` struct
+   - [x] Add `admin_user` and `admin_password` fields (both String)
+   - [x] Implement `Default` trait with default values ("admin"/"admin")
+   - [x] Add `Serialize`, `Deserialize`, `Debug`, `Clone`, `PartialEq` derives
+   - [x] Add comprehensive unit tests (5+ tests covering defaults, serialization, deserialization)
 
 2. **Environment User Inputs Extension**:
 
-   - [ ] Add `grafana: Option<GrafanaConfig>` field to `UserInputs` struct
-   - [ ] Add `#[serde(skip_serializing_if = "Option::is_none")]` attribute
-   - [ ] Update all constructors and test fixtures to include `grafana` field
-   - [ ] Update JSON schema (`schemas/environment-config.json`) with Grafana section
+   - [x] Add `grafana: Option<GrafanaConfig>` field to `UserInputs` struct
+   - [x] Add `#[serde(skip_serializing_if = "Option::is_none")]` attribute
+   - [x] Update all constructors and test fixtures to include `grafana` field
+   - [x] Update JSON schema (`schemas/environment-config.json`) with Grafana section
 
 3. **Validation Logic** (`src/application/command_handlers/create/config/validation/`):
 
-   - [ ] Create validation module if it doesn't exist
-   - [ ] Implement `validate_grafana_prometheus_dependency()` function
-   - [ ] Add `ConfigError::GrafanaRequiresPrometheus` error variant
-   - [ ] Add comprehensive error help text with fix instructions
-   - [ ] Write unit tests for all validation scenarios:
-     - [ ] Both enabled (valid)
-     - [ ] Both disabled (valid)
-     - [ ] Only Prometheus enabled (valid)
-     - [ ] Only Grafana enabled (invalid - should error)
-   - [ ] Integrate validation call in environment creation handler
-   - [ ] Run linters and tests
+   - [x] Create validation module if it doesn't exist
+   - [x] Implement `validate_grafana_prometheus_dependency()` function
+   - [x] Add `ConfigError::GrafanaRequiresPrometheus` error variant
+   - [x] Add comprehensive error help text with fix instructions
+   - [x] Write unit tests for all validation scenarios:
+     - [x] Both enabled (valid)
+     - [x] Both disabled (valid)
+     - [x] Only Prometheus enabled (valid)
+     - [x] Only Grafana enabled (invalid - should error)
+   - [x] Integrate validation call in environment creation handler
+   - [x] Run linters and tests
 
 4. **Testing**:
-   - [ ] Run `cargo test` - all tests should pass
-   - [ ] Run `cargo run --bin linter all` - all linters should pass
+   - [x] Run `cargo test` - all tests should pass
+   - [x] Run `cargo run --bin linter all` - all linters should pass
 
 ### Phase 2: Docker Compose Integration
 
@@ -547,26 +547,26 @@ fn create_environment_from_config(config: UserInputs) -> Result<Environment, Con
 
 1. **Docker Compose Context** (`src/infrastructure/templating/docker_compose/template/wrappers/compose/context.rs`):
 
-   - [ ] Add `grafana_config: Option<GrafanaConfig>` field to `DockerComposeContext`
-   - [ ] Implement `with_grafana()` method for context builder pattern
-   - [ ] Add unit tests for Grafana context inclusion
+   - [x] Add `grafana_config: Option<GrafanaConfig>` field to `DockerComposeContext`
+   - [x] Implement `with_grafana()` method for context builder pattern
+   - [x] Add unit tests for Grafana context inclusion
 
 2. **Environment Variables Context** (`src/infrastructure/templating/docker_compose/template/wrappers/env/context.rs`):
 
-   - [ ] Add optional Grafana fields to `EnvContext` struct:
+   - [x] Add optional Grafana fields to `EnvContext` struct:
      - `grafana_admin_user: Option<String>`
      - `grafana_admin_password: Option<String>` (plain String for template rendering)
-   - [ ] Implement `new_with_grafana()` constructor method
-   - [ ] Constructor must call `.expose_secret()` on `Password` to extract plaintext for template
-   - [ ] Add getters for Grafana fields
-   - [ ] Add unit tests for environment variable generation
+   - [x] Implement `new_with_grafana()` constructor method
+   - [x] Constructor must call `.expose_secret()` on `Password` to extract plaintext for template
+   - [x] Add getters for Grafana fields
+   - [x] Add unit tests for environment variable generation
 
    **Security Note**: The `admin_password` is stored as plain `String` in the context because Tera templates need the plaintext value. The `Password` wrapper is only used in the domain model and configuration. Call `.expose_secret()` when constructing the context from `GrafanaConfig`.
 
 3. **Docker Compose Template** (`templates/docker-compose/docker-compose.yml.tera`):
 
-   - [ ] Add conditional Grafana service block with `{% if grafana_config %}`
-   - [ ] Configure Grafana service:
+   - [x] Add conditional Grafana service block with `{% if grafana_config %}`
+   - [x] Configure Grafana service:
      - Image: `grafana/grafana:11.4.0`
      - Container name: `grafana`
      - Restart policy: `unless-stopped`
@@ -576,20 +576,20 @@ fn create_environment_from_config(config: UserInputs) -> Result<Environment, Con
      - Volume: `grafana_data:/var/lib/grafana`
      - Logging configuration (10m max-size, 10 max-file)
      - Depends on: `prometheus`
-   - [ ] Add conditional volume declaration for `grafana_data`
+   - [x] Add conditional volume declaration for `grafana_data`
 
 4. **Environment Template** (`templates/docker-compose/.env.tera`):
 
-   - [ ] Add conditional Grafana section with `{% if grafana_config %}`
-   - [ ] Add environment variables:
+   - [x] Add conditional Grafana section with `{% if grafana_config %}`
+   - [x] Add environment variables:
      - `GF_SECURITY_ADMIN_USER='{{ grafana_admin_user }}'`
      - `GF_SECURITY_ADMIN_PASSWORD='{{ grafana_admin_password }}'`
 
 5. **Release Command Integration** (`src/application/command_handlers/release/`):
 
-   - [ ] Update docker-compose rendering step to include Grafana context
-   - [ ] Pass Grafana config to `DockerComposeContext::with_grafana()` when present
-   - [ ] Pass Grafana credentials to `EnvContext` when present
+   - [x] Update docker-compose rendering step to include Grafana context
+   - [x] Pass Grafana config to `DockerComposeContext::with_grafana()` when present
+   - [x] Pass Grafana credentials to `EnvContext` when present
 
 6. **Firewall Configuration** (NEW):
 

src/application/steps/rendering/docker_compose_templates.rs

@@ -125,8 +125,14 @@ impl<S> RenderDockerComposeTemplatesStep<S> {
 
         // Apply Prometheus configuration (independent of database choice)
         let builder = self.apply_prometheus_config(builder);
+
+        // Apply Grafana configuration (independent of database choice)
+        let builder = self.apply_grafana_config(builder);
         let docker_compose_context = builder.build();
 
+        // Apply Grafana credentials to env context
+        let env_context = self.apply_grafana_env_context(env_context);
+
         let compose_build_dir = generator
             .render(&env_context, &docker_compose_context)
             .await?;
@@ -210,6 +216,28 @@ impl<S> RenderDockerComposeTemplatesStep<S> {
         }
     }
 
+    fn apply_grafana_config(
+        &self,
+        builder: DockerComposeContextBuilder,
+    ) -> DockerComposeContextBuilder {
+        if let Some(grafana_config) = self.environment.grafana_config() {
+            builder.with_grafana(grafana_config.clone())
+        } else {
+            builder
+        }
+    }
+
+    fn apply_grafana_env_context(&self, env_context: EnvContext) -> EnvContext {
+        if let Some(grafana_config) = self.environment.grafana_config() {
+            env_context.with_grafana(
+                grafana_config.admin_user().to_string(),
+                grafana_config.admin_password().expose_secret().to_string(),
+            )
+        } else {
+            env_context
+        }
+    }
+
     fn extract_tracker_ports(tracker_config: &TrackerConfig) -> (Vec<u16>, Vec<u16>, u16) {
         // Extract UDP tracker ports
         let udp_ports: Vec<u16> = tracker_config

src/domain/environment/context.rs

@@ -37,6 +37,8 @@
 
 use crate::adapters::ssh::SshCredentials;
 use crate::domain::environment::{EnvironmentName, InternalConfig, RuntimeOutputs, UserInputs};
+use crate::domain::grafana::GrafanaConfig;
+use crate::domain::prometheus::PrometheusConfig;
 use crate::domain::provider::ProviderConfig;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
@@ -337,10 +339,16 @@ impl EnvironmentContext {
 
     /// Returns the Prometheus configuration if enabled
     #[must_use]
-    pub fn prometheus_config(&self) -> Option<&crate::domain::prometheus::PrometheusConfig> {
+    pub fn prometheus_config(&self) -> Option<&PrometheusConfig> {
         self.user_inputs.prometheus.as_ref()
     }
 
+    /// Returns the Grafana configuration if enabled
+    #[must_use]
+    pub fn grafana_config(&self) -> Option<&GrafanaConfig> {
+        self.user_inputs.grafana.as_ref()
+    }
+
     /// Returns the build directory
     #[must_use]
     pub fn build_dir(&self) -> &PathBuf {

src/domain/environment/mod.rs

@@ -134,6 +134,9 @@ pub use crate::domain::tracker::{
 // Re-export Prometheus types for convenience
 pub use crate::domain::prometheus::PrometheusConfig;
 
+// Re-export Grafana types for convenience
+pub use crate::domain::grafana::GrafanaConfig;
+
 use crate::adapters::ssh::SshCredentials;
 use crate::domain::provider::ProviderConfig;
 use crate::domain::{InstanceName, ProfileName};
@@ -448,6 +451,12 @@ impl<S> Environment<S> {
         self.context.prometheus_config()
     }
 
+    /// Returns the Grafana configuration if enabled
+    #[must_use]
+    pub fn grafana_config(&self) -> Option<&GrafanaConfig> {
+        self.context.grafana_config()
+    }
+
     /// Returns the SSH username for this environment
     #[must_use]
     pub fn ssh_username(&self) -> &Username {

src/domain/environment/testing.rs

@@ -6,6 +6,7 @@
 use super::*;
 use crate::adapters::ssh::SshCredentials;
 use crate::domain::grafana::GrafanaConfig;
+use crate::domain::prometheus::PrometheusConfig;
 use crate::domain::provider::{LxdConfig, ProviderConfig};
 use crate::domain::tracker::TrackerConfig;
 use crate::domain::EnvironmentName;
@@ -39,7 +40,7 @@ pub struct EnvironmentTestBuilder {
     ssh_key_name: String,
     ssh_username: String,
     temp_dir: TempDir,
-    prometheus_config: Option<crate::domain::prometheus::PrometheusConfig>,
+    prometheus_config: Option<PrometheusConfig>,
 }
 
 impl EnvironmentTestBuilder {
@@ -55,7 +56,7 @@ impl EnvironmentTestBuilder {
             ssh_key_name: "test_key".to_string(),
             ssh_username: "torrust".to_string(),
             temp_dir: TempDir::new().expect("Failed to create temp directory"),
-            prometheus_config: Some(crate::domain::prometheus::PrometheusConfig::default()),
+            prometheus_config: Some(PrometheusConfig::default()),
         }
     }
 
@@ -82,10 +83,7 @@ impl EnvironmentTestBuilder {
 
     /// Sets the Prometheus configuration
     #[must_use]
-    pub fn with_prometheus_config(
-        mut self,
-        config: Option<crate::domain::prometheus::PrometheusConfig>,
-    ) -> Self {
+    pub fn with_prometheus_config(mut self, config: Option<PrometheusConfig>) -> Self {
         self.prometheus_config = config;
         self
     }

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

@@ -1,6 +1,7 @@
 //! Builder for `DockerComposeContext`
 
 // Internal crate
+use crate::domain::grafana::GrafanaConfig;
 use crate::domain::prometheus::PrometheusConfig;
 
 use super::database::{DatabaseConfig, MysqlSetupConfig, DRIVER_MYSQL, DRIVER_SQLITE};
@@ -14,6 +15,7 @@ pub struct DockerComposeContextBuilder {
     ports: TrackerPorts,
     database: DatabaseConfig,
     prometheus_config: Option<PrometheusConfig>,
+    grafana_config: Option<GrafanaConfig>,
 }
 
 impl DockerComposeContextBuilder {
@@ -26,6 +28,7 @@ impl DockerComposeContextBuilder {
                 mysql: None,
             },
             prometheus_config: None,
+            grafana_config: None,
         }
     }
 
@@ -54,13 +57,25 @@ impl DockerComposeContextBuilder {
         self
     }
 
+    /// Adds Grafana configuration
+    ///
+    /// # Arguments
+    ///
+    /// * `grafana_config` - Grafana configuration
+    #[must_use]
+    pub fn with_grafana(mut self, grafana_config: GrafanaConfig) -> Self {
+        self.grafana_config = Some(grafana_config);
+        self
+    }
+
     /// Builds the `DockerComposeContext`
     #[must_use]
     pub fn build(self) -> DockerComposeContext {
         DockerComposeContext {
             database: self.database,
             ports: self.ports,
             prometheus_config: self.prometheus_config,
+            grafana_config: self.grafana_config,
         }
     }
 }

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

@@ -7,6 +7,7 @@
 use serde::Serialize;
 
 // Internal crate
+use crate::domain::grafana::GrafanaConfig;
 use crate::domain::prometheus::PrometheusConfig;
 
 // Submodules
@@ -31,6 +32,9 @@ pub struct DockerComposeContext {
     /// Prometheus configuration (optional)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub prometheus_config: Option<PrometheusConfig>,
+    /// Grafana configuration (optional)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub grafana_config: Option<GrafanaConfig>,
 }
 
 impl DockerComposeContext {
@@ -93,6 +97,12 @@ impl DockerComposeContext {
     pub fn prometheus_config(&self) -> Option<&PrometheusConfig> {
         self.prometheus_config.as_ref()
     }
+
+    /// Get the Grafana configuration if present
+    #[must_use]
+    pub fn grafana_config(&self) -> Option<&GrafanaConfig> {
+        self.grafana_config.as_ref()
+    }
 }
 
 #[cfg(test)]