diff --git a/packages/settings-metrics/Cargo.toml b/packages/settings-metrics/Cargo.toml new file mode 100644 index 00000000000..7b5fe61212e --- /dev/null +++ b/packages/settings-metrics/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "settings-metrics" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" + +[lib] +path = "../packages.rs" + +[package.metadata.build-package] +source-groups = [ + "settings-extensions/metrics" +] + +# RPM BuildRequires +[build-dependencies] +glibc = { path = "../glibc" } + +# RPM Requires +[dependencies] + diff --git a/packages/settings-metrics/settings-metrics.spec b/packages/settings-metrics/settings-metrics.spec new file mode 100644 index 00000000000..7ec9ae4e3f7 --- /dev/null +++ b/packages/settings-metrics/settings-metrics.spec @@ -0,0 +1,39 @@ +%global _cross_first_party 1 +%undefine _debugsource_packages + +%global extension_name metrics + +Name: %{_cross_os}settings-%{extension_name} +Version: 0.0 +Release: 0%{?dist} +Summary: settings-%{extension_name} +License: Apache-2.0 OR MIT +URL: https://github.com/bottlerocket-os/bottlerocket + +BuildRequires: %{_cross_os}glibc-devel + +%description +%{summary}. + +%prep +%setup -T -c +%cargo_prep + +%build +%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \ + -p settings-extension-%{extension_name} + +%install +install -d %{buildroot}%{_cross_libexecdir} +install -p -m 0755 \ + ${HOME}/.cache/%{__cargo_target}/release/settings-extension-%{extension_name} \ + %{buildroot}%{_cross_libexecdir} + +install -d %{buildroot}%{_cross_libexecdir}/settings +ln -sf \ + ../settings-extension-%{extension_name} \ + %{buildroot}%{_cross_libexecdir}/settings/%{extension_name} + +%files +%{_cross_libexecdir}/settings-extension-%{extension_name} +%{_cross_libexecdir}/settings/%{extension_name} diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 0c5317be305..911f038d19f 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -2820,6 +2820,7 @@ dependencies = [ "settings-extension-aws", "settings-extension-container-registry", "settings-extension-kernel", + "settings-extension-metrics", "settings-extension-motd", "settings-extension-ntp", "settings-extension-pki", @@ -3938,6 +3939,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "settings-extension-metrics" +version = "0.1.0" +dependencies = [ + "bottlerocket-settings-sdk", + "env_logger", + "model-derive", + "modeled-types", + "serde", + "serde_json", +] + [[package]] name = "settings-extension-motd" version = "0.1.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 7b426af545d..d2b23f554c0 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -131,6 +131,7 @@ members = [ "settings-extensions/aws", "settings-extensions/container-registry", "settings-extensions/kernel", + "settings-extensions/metrics", "settings-extensions/motd", "settings-extensions/ntp", "settings-extensions/pki", diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml index 9aa930e3d5a..4c7306dded1 100644 --- a/sources/models/Cargo.toml +++ b/sources/models/Cargo.toml @@ -21,6 +21,7 @@ toml = "0.8" settings-extension-aws = { path = "../settings-extensions/aws", version = "0.1" } settings-extension-container-registry = { path = "../settings-extensions/container-registry", version = "0.1" } settings-extension-kernel = { path = "../settings-extensions/kernel", version = "0.1" } +settings-extension-metrics = { path = "../settings-extensions/metrics", version = "0.1" } settings-extension-motd = { path = "../settings-extensions/motd", version = "0.1" } settings-extension-ntp = { path = "../settings-extensions/ntp", version = "0.1" } settings-extension-pki = { path = "../settings-extensions/pki", version = "0.1" } diff --git a/sources/models/src/aws-dev/mod.rs b/sources/models/src/aws-dev/mod.rs index e2ceb9d80d3..f75e72813e7 100644 --- a/sources/models/src/aws-dev/mod.rs +++ b/sources/models/src/aws-dev/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, HostContainer, - MetricsSettings, NetworkSettings, OciHooks, + NetworkSettings, OciHooks, }; use modeled_types::Identifier; @@ -20,7 +20,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_hooks: OciHooks, diff --git a/sources/models/src/aws-ecs-1-nvidia/mod.rs b/sources/models/src/aws-ecs-1-nvidia/mod.rs index b201981d994..81b573f062b 100644 --- a/sources/models/src/aws-ecs-1-nvidia/mod.rs +++ b/sources/models/src/aws-ecs-1-nvidia/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ AutoScalingSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, ECSSettings, - HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, + HostContainer, NetworkSettings, OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -20,7 +20,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, aws: settings_extension_aws::AwsSettingsV1, ecs: ECSSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-ecs-1/mod.rs b/sources/models/src/aws-ecs-1/mod.rs index b201981d994..81b573f062b 100644 --- a/sources/models/src/aws-ecs-1/mod.rs +++ b/sources/models/src/aws-ecs-1/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ AutoScalingSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, ECSSettings, - HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, + HostContainer, NetworkSettings, OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -20,7 +20,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, aws: settings_extension_aws::AwsSettingsV1, ecs: ECSSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-ecs-2-nvidia/mod.rs b/sources/models/src/aws-ecs-2-nvidia/mod.rs index c9326ddb966..3a900eaa581 100644 --- a/sources/models/src/aws-ecs-2-nvidia/mod.rs +++ b/sources/models/src/aws-ecs-2-nvidia/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, - ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, + ECSSettings, HostContainer, NetworkSettings, OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -21,7 +21,7 @@ struct Settings { boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, ecs: ECSSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-ecs-2/mod.rs b/sources/models/src/aws-ecs-2/mod.rs index c9326ddb966..3a900eaa581 100644 --- a/sources/models/src/aws-ecs-2/mod.rs +++ b/sources/models/src/aws-ecs-2/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, - ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, + ECSSettings, HostContainer, NetworkSettings, OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -21,7 +21,7 @@ struct Settings { boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, ecs: ECSSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.24-nvidia/mod.rs b/sources/models/src/aws-k8s-1.24-nvidia/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.24-nvidia/mod.rs +++ b/sources/models/src/aws-k8s-1.24-nvidia/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.24/mod.rs b/sources/models/src/aws-k8s-1.24/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.24/mod.rs +++ b/sources/models/src/aws-k8s-1.24/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.25-nvidia/mod.rs b/sources/models/src/aws-k8s-1.25-nvidia/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.25-nvidia/mod.rs +++ b/sources/models/src/aws-k8s-1.25-nvidia/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.25/mod.rs b/sources/models/src/aws-k8s-1.25/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.25/mod.rs +++ b/sources/models/src/aws-k8s-1.25/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.26-nvidia/mod.rs b/sources/models/src/aws-k8s-1.26-nvidia/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.26-nvidia/mod.rs +++ b/sources/models/src/aws-k8s-1.26-nvidia/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.26/mod.rs b/sources/models/src/aws-k8s-1.26/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.26/mod.rs +++ b/sources/models/src/aws-k8s-1.26/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.30-nvidia/mod.rs b/sources/models/src/aws-k8s-1.30-nvidia/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.30-nvidia/mod.rs +++ b/sources/models/src/aws-k8s-1.30-nvidia/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/aws-k8s-1.30/mod.rs b/sources/models/src/aws-k8s-1.30/mod.rs index 886a750f7ee..913676824f2 100644 --- a/sources/models/src/aws-k8s-1.30/mod.rs +++ b/sources/models/src/aws-k8s-1.30/mod.rs @@ -1,7 +1,7 @@ use crate::{ AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, - NetworkSettings, OciDefaults, OciHooks, + ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, NetworkSettings, + OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -22,7 +22,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/metal-dev/mod.rs b/sources/models/src/metal-dev/mod.rs index b36501b42f2..89907ac11fb 100644 --- a/sources/models/src/metal-dev/mod.rs +++ b/sources/models/src/metal-dev/mod.rs @@ -2,8 +2,7 @@ use model_derive::model; use std::collections::HashMap; use crate::{ - BootSettings, BootstrapContainer, DnsSettings, HostContainer, MetricsSettings, NetworkSettings, - OciHooks, + BootSettings, BootstrapContainer, DnsSettings, HostContainer, NetworkSettings, OciHooks, }; use modeled_types::Identifier; @@ -19,7 +18,7 @@ struct Settings { network: NetworkSettings, kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_hooks: OciHooks, diff --git a/sources/models/src/metal-k8s-1.29/mod.rs b/sources/models/src/metal-k8s-1.29/mod.rs index 4e22edf6eb0..4f76250fa80 100644 --- a/sources/models/src/metal-k8s-1.29/mod.rs +++ b/sources/models/src/metal-k8s-1.29/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer, - KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, + KubernetesSettings, NetworkSettings, OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -21,7 +21,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, aws: settings_extension_aws::AwsSettingsV1, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/models/src/vmware-dev/mod.rs b/sources/models/src/vmware-dev/mod.rs index b36501b42f2..89907ac11fb 100644 --- a/sources/models/src/vmware-dev/mod.rs +++ b/sources/models/src/vmware-dev/mod.rs @@ -2,8 +2,7 @@ use model_derive::model; use std::collections::HashMap; use crate::{ - BootSettings, BootstrapContainer, DnsSettings, HostContainer, MetricsSettings, NetworkSettings, - OciHooks, + BootSettings, BootstrapContainer, DnsSettings, HostContainer, NetworkSettings, OciHooks, }; use modeled_types::Identifier; @@ -19,7 +18,7 @@ struct Settings { network: NetworkSettings, kernel: settings_extension_kernel::KernelSettingsV1, boot: BootSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_hooks: OciHooks, diff --git a/sources/models/src/vmware-k8s-1.30/mod.rs b/sources/models/src/vmware-k8s-1.30/mod.rs index 5fb0ac5cfce..3d30b37973a 100644 --- a/sources/models/src/vmware-k8s-1.30/mod.rs +++ b/sources/models/src/vmware-k8s-1.30/mod.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use crate::{ BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer, - KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, + KubernetesSettings, NetworkSettings, OciDefaults, OciHooks, }; use modeled_types::Identifier; @@ -21,7 +21,7 @@ struct Settings { kernel: settings_extension_kernel::KernelSettingsV1, aws: settings_extension_aws::AwsSettingsV1, boot: BootSettings, - metrics: MetricsSettings, + metrics: settings_extension_metrics::MetricsSettingsV1, pki: settings_extension_pki::PkiSettingsV1, container_registry: settings_extension_container_registry::RegistrySettingsV1, oci_defaults: OciDefaults, diff --git a/sources/settings-extensions/metrics/Cargo.toml b/sources/settings-extensions/metrics/Cargo.toml new file mode 100644 index 00000000000..4f85f55352a --- /dev/null +++ b/sources/settings-extensions/metrics/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "settings-extension-metrics" +version = "0.1.0" +authors = ["Sumukh Ballal "] +license = "Apache-2.0 OR MIT" +edition = "2021" +publish = false + +[dependencies] +env_logger = "0.10" +modeled-types = { path = "../../models/modeled-types", version = "0.1" } +model-derive = { path = "../../models/model-derive", version = "0.1" } +serde = { version = "1", features = ["derive"] } +serde_json = "1" + +[dependencies.bottlerocket-settings-sdk] +git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk" +tag = "bottlerocket-settings-sdk-v0.1.0-alpha.2" +version = "0.1.0-alpha" diff --git a/sources/settings-extensions/metrics/metrics.toml b/sources/settings-extensions/metrics/metrics.toml new file mode 100644 index 00000000000..375dcc5b135 --- /dev/null +++ b/sources/settings-extensions/metrics/metrics.toml @@ -0,0 +1,14 @@ +[extension] +supported-versions = [ + "v1" +] +default-version = "v1" + +[v1] +[v1.validation.cross-validates] + +[v1.templating] +helpers = [] + +[v1.generation.requires] + diff --git a/sources/settings-extensions/metrics/src/lib.rs b/sources/settings-extensions/metrics/src/lib.rs new file mode 100644 index 00000000000..0d7f438a278 --- /dev/null +++ b/sources/settings-extensions/metrics/src/lib.rs @@ -0,0 +1,80 @@ +/// The aws settings can be used to configure settings related to AWS +use bottlerocket_settings_sdk::{GenerateResult, SettingsModel}; +use model_derive::model; +use modeled_types::Url; +use std::convert::Infallible; + +// Platform-specific settings +#[model(impl_default = true)] +pub struct MetricsSettingsV1 { + metrics_url: Url, + send_metrics: bool, + service_checks: Vec, +} + +type Result = std::result::Result; + +impl SettingsModel for MetricsSettingsV1 { + type PartialKind = Self; + type ErrorKind = Infallible; + + fn get_version() -> &'static str { + "v1" + } + + fn set(_current_value: Option, _target: Self) -> Result<()> { + // allow anything that parses as MetricsSettingsV1 + Ok(()) + } + + fn generate( + existing_partial: Option, + _dependent_settings: Option, + ) -> Result> { + Ok(GenerateResult::Complete( + existing_partial.unwrap_or_default(), + )) + } + + fn validate(_value: Self, _validated_settings: Option) -> Result<()> { + Ok(()) + } +} + +#[cfg(test)] +mod test { + use super::*; + + #[test] + fn test_generate_metrics() { + let generated = MetricsSettingsV1::generate(None, None).unwrap(); + assert_eq!( + generated, + GenerateResult::Complete(MetricsSettingsV1 { + metrics_url: None, + send_metrics: None, + service_checks: None, + }) + ) + } + + #[test] + fn test_serde_metrics() { + let test_json = r#"{"metrics-url":"https://metrics.bottlerocket.aws/v1/metrics","send-metrics":true,"service-checks":["apiserver","chronyd"]}"#; + + let metrics: MetricsSettingsV1 = serde_json::from_str(test_json).unwrap(); + assert_eq!( + metrics, + MetricsSettingsV1 { + metrics_url: Some( + Url::try_from("https://metrics.bottlerocket.aws/v1/metrics").unwrap() + ), + send_metrics: Some(true), + service_checks: Some(vec![String::from("apiserver"), String::from("chronyd")]) + } + ); + + let results = serde_json::to_string(&metrics).unwrap(); + assert_eq!(results, test_json); + } +} diff --git a/sources/settings-extensions/metrics/src/main.rs b/sources/settings-extensions/metrics/src/main.rs new file mode 100644 index 00000000000..f919620fb8b --- /dev/null +++ b/sources/settings-extensions/metrics/src/main.rs @@ -0,0 +1,18 @@ +use bottlerocket_settings_sdk::{BottlerocketSetting, NullMigratorExtensionBuilder}; +use settings_extension_metrics::MetricsSettingsV1; +use std::process::ExitCode; + +fn main() -> ExitCode { + env_logger::init(); + + match NullMigratorExtensionBuilder::with_name("metrics") + .with_models(vec![BottlerocketSetting::::model()]) + .build() + { + Ok(extension) => extension.run(), + Err(e) => { + println!("{}", e); + ExitCode::FAILURE + } + } +}