feat: added a default config structure for kubeprometheus chart

.cargo/config.toml

@@ -1,5 +0,0 @@
-[target.x86_64-pc-windows-msvc]
-rustflags = ["-C", "link-arg=/STACK:8000000"]
-
-[target.x86_64-pc-windows-gnu]
-rustflags = ["-C", "link-arg=-Wl,--stack,8000000"]

Cargo.lock

@@ -4,13 +4,19 @@ version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
 
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -54,15 +60,15 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "const-random",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -192,17 +198,17 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
+ "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -248,9 +254,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 dependencies = [
  "serde",
 ]
@@ -350,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.22"
+version = "1.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
+checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a"
 dependencies = [
  "shlex",
 ]
@@ -407,9 +413,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.38"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -417,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.38"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
 dependencies = [
  "anstream",
  "anstyle",
@@ -447,9 +453,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "color-eyre"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e1761c0e16f8883bbbb8ce5990867f4f06bf11a0253da6495a04ce4b6ef0ec"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
 dependencies = [
  "backtrace",
  "color-spantrace",
@@ -462,9 +468,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ddd8d5bfda1e11a501d0a7303f3bfed9aa632ebdb859be40d0fd70478ed70d5"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -608,7 +614,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "crossterm_winapi",
  "futures-core",
  "mio 1.0.3",
@@ -930,15 +936,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "email_address"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1124,7 +1121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.8",
 ]
 
 [[package]]
@@ -1175,16 +1172,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fqdn"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f5d7f7b3eed2f771fc7f6fcb651f9560d7b0c483d75876082acb4649d266b3"
-dependencies = [
- "punycode",
- "serde",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1324,9 +1311,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1346,9 +1333,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "group"
@@ -1382,9 +1369,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.10"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1409,9 +1396,7 @@ dependencies = [
  "derive-new",
  "directories",
  "dockerfile_builder",
- "email_address",
  "env_logger",
- "fqdn",
  "harmony_macros",
  "harmony_types",
  "helm-wrapper-rs",
@@ -1434,7 +1419,6 @@ dependencies = [
  "serde-value",
  "serde_json",
  "serde_yaml",
- "temp-dir",
  "temp-file",
  "tokio",
  "url",
@@ -1492,9 +1476,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -1708,7 +1692,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.10",
+ "h2 0.4.9",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -1847,22 +1831,21 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
  "displaydoc",
- "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locale_core"
+name = "icu_locid"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1872,10 +1855,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "icu_normalizer"
+name = "icu_locid_transform"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -1883,54 +1886,67 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locale_core",
+ "icu_locid_transform",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
+ "tinystr",
- "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
+checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
 dependencies = [
  "displaydoc",
- "icu_locale_core",
+ "icu_locid",
+ "icu_provider_macros",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
- "zerotrie",
  "zerovec",
 ]
 
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1950,9 +1966,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1996,7 +2012,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "crossterm 0.25.0",
  "dyn-clone",
  "fuzzy-matcher",
@@ -2059,9 +2075,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.13"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806"
+checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
 dependencies = [
  "jiff-static",
  "log",
@@ -2072,9 +2088,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.13"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48"
+checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2233,9 +2249,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72"
 
 [[package]]
 name = "libredfish"
@@ -2256,7 +2272,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "libc",
 ]
 
@@ -2274,9 +2290,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
 
 [[package]]
 name = "lock_api"
@@ -2330,6 +2346,15 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.8"
@@ -2474,18 +2499,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "octocrab"
-version = "0.44.1"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86996964f8b721067b6ed238aa0ccee56ecad6ee5e714468aa567992d05d2b91"
+checksum = "aaf799a9982a4d0b4b3fa15b4c1ff7daf5bd0597f46456744dcbb6ddc2e4c827"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -2539,7 +2564,7 @@ version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2567,9 +2592,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
 dependencies = [
  "cc",
  "libc",
@@ -2633,9 +2658,9 @@ dependencies = [
 
 [[package]]
 name = "owo-colors"
-version = "4.2.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "p256"
@@ -2921,15 +2946,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "potential_utf"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
-dependencies = [
- "zerovec",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -2942,7 +2958,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.8.25",
 ]
 
 [[package]]
@@ -3000,12 +3016,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "punycode"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e1dcb320d6839f6edb64f7a4a59d39b30480d4d1765b56873f7c858538a5fe"
-
 [[package]]
 name = "quote"
 version = "1.0.40"
@@ -3083,7 +3093,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.2",
 ]
 
 [[package]]
@@ -3092,7 +3102,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "cassowary",
  "compact_str",
  "crossterm 0.28.1",
@@ -3109,11 +3119,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
@@ -3207,7 +3217,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.10",
+ "h2 0.4.9",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
@@ -3296,7 +3306,7 @@ dependencies = [
  "aes",
  "aes-gcm",
  "async-trait",
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "byteorder",
  "cbc",
  "chacha20",
@@ -3397,7 +3407,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bb94393cafad0530145b8f626d8687f1ee1dedb93d7ba7740d6ae81868b13b5"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "bytes",
  "chrono",
  "flurry",
@@ -3444,7 +3454,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -3453,11 +3463,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -3466,9 +3476,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
 dependencies = [
  "log",
  "once_cell",
@@ -3524,18 +3534,15 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
-dependencies = [
- "zeroize",
-]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3618,7 +3625,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -3631,7 +3638,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
@@ -3762,9 +3769,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -3788,9 +3795,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.18"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -4026,9 +4033,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4052,7 +4059,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
@@ -4083,12 +4090,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
-[[package]]
-name = "temp-dir"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
-
 [[package]]
 name = "temp-file"
 version = "0.1.9"
@@ -4097,14 +4098,14 @@ checksum = "b5ff282c3f91797f0acb021f3af7fffa8a78601f0f2fd0a9f79ee7dcf9a9af9e"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.2",
  "once_cell",
- "rustix 1.0.7",
+ "rustix 1.0.5",
  "windows-sys 0.59.0",
 ]
 
@@ -4206,9 +4207,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -4216,9 +4217,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.45.0"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4305,12 +4306,12 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.4"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
 dependencies = [
  "base64 0.22.1",
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
  "bytes",
  "futures-util",
  "http 1.3.1",
@@ -4492,6 +4493,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4510,7 +4517,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.2",
  "rand 0.9.1",
  "uuid-macro-internal",
 ]
@@ -5011,14 +5018,20 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
-name = "writeable"
+name = "write16"
-version = "0.6.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "wyz"
@@ -5067,9 +5080,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -5079,9 +5092,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5089,13 +5102,33 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive 0.7.35",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.8.25",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -5136,22 +5169,11 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
-[[package]]
-name = "zerotrie"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
-]
-
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -5160,9 +5182,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",

examples/lamp/Cargo.toml

@@ -16,5 +16,3 @@ harmony_macros = { path = "../../harmony_macros" }
 log = { workspace = true }
 env_logger = { workspace = true }
 url = { workspace = true }
-typetag = "0.2.20"
-serde = "1.0.219"

examples/lamp/src/main.rs

@@ -2,10 +2,7 @@ use harmony::{
     data::Version,
     inventory::Inventory,
     maestro::Maestro,
-    modules::{
+    modules::lamp::{LAMPConfig, LAMPScore},
-        lamp::{LAMPConfig, LAMPScore},
-        monitoring::{kube_prometheus::prometheus_alert_channel::{DiscordChannel, SlackChannel}, monitoring_alerting::MonitoringAlertingScore},
-    },
     topology::{K8sAnywhereTopology, Url},
 };
 
@@ -27,47 +24,22 @@ async fn main() {
         // This config can be extended as needed for more complicated configurations
         config: LAMPConfig {
             project_root: "./php".into(),
-            database_size: format!("4Gi").into(),
+            database_size: format!("2Gi").into(),
             ..Default::default()
         },
     };
 
-
     // You can choose the type of Topology you want, we suggest starting with the
     // K8sAnywhereTopology as it is the most automatic one that enables you to easily deploy
     // locally, to development environment from a CI, to staging, and to production with settings
     // that automatically adapt to each environment grade.
-    let mut maestro = Maestro::<K8sAnywhereTopology>::initialize    (
+    let mut maestro = Maestro::<K8sAnywhereTopology>::initialize(
         Inventory::autoload(),
         K8sAnywhereTopology::new(),
     )
     .await
     .unwrap();
-
+    maestro.register_all(vec![Box::new(lamp_stack)]);
-    let url = url::Url::parse(
-        "https://hooks.slack.com/services/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",
-    )
-    .expect("invalid URL");
-
-    let mut monitoring_stack_score = MonitoringAlertingScore::new();
-    monitoring_stack_score.namespace = Some(lamp_stack.config.namespace.clone());
-    monitoring_stack_score.alert_channels = vec![(Box::new(SlackChannel {
-            name: "alert-test".to_string(),
-            webhook_url: url,})),
-            (Box::new(DiscordChannel {
-            name: "discord".to_string(),
-            webhook_url: url::Url::parse("https://discord.com/api/webhooks/1372994201746276462/YRn4TA9pj8ve3lfmyj1j0Yx97i92gv4U_uavt4CV4_SSIVArYUqfDzMOmzSTic2d8XSL").expect("invalid URL"),}))];
-
-        
-        //TODO in process of testing 
-        //webhook depricated in MSTeams August 2025
-        //(AlertChannel::MSTeams { 
-        //    connector: "alert-test".to_string(), 
-        //    webhook_url: url::Url::parse("").expect("invalid URL"),
-        //}),
-    
-
-    maestro.register_all(vec![Box::new(monitoring_stack_score)]);
     // Here we bootstrap the CLI, this gives some nice features if you need them
     harmony_cli::init(maestro, None).await.unwrap();
 }

examples/ms_teams_alert_channel/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "ms_teams_alert_channel"
-edition = "2024"
-version.workspace = true
-readme.workspace = true
-license.workspace = true
-
-[dependencies]
-harmony = { version = "0.1.0", path = "../../harmony" }
-harmony_cli = { version = "0.1.0", path = "../../harmony_cli" }
-serde = "1.0.219"
-tokio.workspace = true
-typetag = "0.2.20"
-url.workspace = true

examples/ms_teams_alert_channel/src/main.rs

@@ -1,65 +0,0 @@
-mod prometheus_msteams;
-use harmony::{
-    interpret::InterpretError, inventory::Inventory, maestro::Maestro, modules::{helm::chart::HelmChartScore, monitoring::{kube_prometheus::{prometheus_alert_channel::PrometheusAlertChannel, types::{AlertChannelConfig, AlertChannelReceiver, AlertChannelRoute, WebhookConfig}}, monitoring_alerting::MonitoringAlertingScore}}, topology::K8sAnywhereTopology
-};
-use prometheus_msteams::prometheus_msteams_score;
-use url::Url;
-use serde::{Serialize, Deserialize};
-
-#[tokio::main]
-async fn main() {
-    let alert_channels: Vec<Box<dyn PrometheusAlertChannel>> = vec![Box::new(MSTeamsChannel {
-        connector: "teams-test".to_string(),
-        webhook_url: url::Url::parse(
-        "https://msteams.com/services/dummy/dummy/dummy",
-    )
-    .expect("invalid URL"),
-    })];
-
-    let monitoring_score = MonitoringAlertingScore {
-        alert_channels,
-        namespace: None,
-    };
-
-    let mut maestro = Maestro::<K8sAnywhereTopology>::initialize(
-        Inventory::autoload(),
-        K8sAnywhereTopology::new(),
-    )
-    .await
-    .unwrap();
-
-    maestro.register_all(vec![Box::new(monitoring_score)]);
-    harmony_cli::init(maestro, None).await.unwrap();
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct MSTeamsChannel {
-    connector: String,
-    webhook_url: Url,
-}
-
-#[typetag::serde]
-impl PrometheusAlertChannel for MSTeamsChannel {
-    fn get_alert_manager_config_contribution(&self) -> Result<AlertChannelConfig, InterpretError> {
-    Ok(AlertChannelConfig{ 
-                receiver: AlertChannelReceiver{ 
-                    name: format!("MSTeams-{}",self.connector), 
-                    slack_configs: None, 
-                    webhook_configs: Some(vec![WebhookConfig{
-                        url: url::Url::parse("http://prometheus-msteams-prometheus-msteams.monitoring.svc.cluster.local:2000/alertmanager").expect("invalid url"),
-                        send_resolved: true,}])
-                    },
-                route: AlertChannelRoute{ 
-                    receiver: format!("MSTeams-{}", self.connector), 
-                    matchers: vec!["alertname!=Watchdog".to_string()], 
-                    r#continue: true,
-                }, 
-                global_config: None, })
-    }
-    fn get_dependency_score(&self, ns: String) -> Option<HelmChartScore> {
-        Some(prometheus_msteams_score(self.connector.clone(), self.webhook_url.clone(), ns.clone()))
-    }
-}   
-
-
-

examples/ms_teams_alert_channel/src/prometheus_msteams.rs

@@ -1,30 +0,0 @@
-use std::str::FromStr;
-
-use harmony::modules::helm::chart::{HelmChartScore, NonBlankString};
-use url::Url;
-
-pub fn prometheus_msteams_score(
-    name: String,
-    webhook_url: Url,
-    namespace: String,
-) -> HelmChartScore {
-    let values = format!(
-        r#"
- connectors:
-   - default: "{webhook_url}"
- "#,
-    );
-
-    HelmChartScore {
-        namespace: Some(NonBlankString::from_str(&namespace).unwrap()),
-        release_name: NonBlankString::from_str(&name).unwrap(),
-        chart_name: NonBlankString::from_str("oci://hub.nationtech.io/library/prometheus-msteams")
-            .unwrap(),
-        chart_version: None,
-        values_overrides: None,
-        values_yaml: Some(values.to_string()),
-        create_namespace: true,
-        install_only: true,
-        repository: None,
-    }
-}

harmony/Cargo.toml

@@ -39,15 +39,3 @@ lazy_static = "1.5.0"
 dockerfile_builder = "0.1.5"
 temp-file = "0.1.9"
 convert_case.workspace = true
-email_address = "0.2.9"
-fqdn = { version = "0.4.6", features = [
-    "domain-label-cannot-start-or-end-with-hyphen",
-    "domain-label-length-limited-to-63",
-    "domain-name-without-special-chars",
-    "domain-name-length-limited-to-255",
-    "punycode",
-    "serde",
-] }
-temp-dir = "0.1.14"
-typetag = "0.2.20"
-dyn-clone = "1.0.19"

harmony/src/domain/topology/k8s_anywhere.rs

@@ -92,7 +92,9 @@ impl K8sAnywhereTopology {
 
     async fn try_get_or_install_k8s_client(&self) -> Result<Option<K8sState>, InterpretError> {
         let k8s_anywhere_config = K8sAnywhereConfig {
-            kubeconfig: std::env::var("KUBECONFIG").ok().map(|v| v.to_string()),
+            kubeconfig: std::env::var("HARMONY_KUBECONFIG")
+                .ok()
+                .map(|v| v.to_string()),
             use_system_kubeconfig: std::env::var("HARMONY_USE_SYSTEM_KUBECONFIG")
                 .map_or_else(|_| false, |v| v.parse().ok().unwrap_or(false)),
             autoinstall: std::env::var("HARMONY_AUTOINSTALL")

harmony/src/infra/opnsense/load_balancer.rs

@@ -370,13 +370,10 @@ mod tests {
         let result = get_servers_for_backend(&backend, &haproxy);
 
         // Check the result
-        assert_eq!(
+        assert_eq!(result, vec![BackendServer {
-            result,
+            address: "192.168.1.1".to_string(),
-            vec![BackendServer {
+            port: 80,
-                address: "192.168.1.1".to_string(),
+        },]);
-                port: 80,
-            },]
-        );
     }
     #[test]
     fn test_get_servers_for_backend_no_linked_servers() {
@@ -433,18 +430,15 @@ mod tests {
         // Call the function
         let result = get_servers_for_backend(&backend, &haproxy);
         // Check the result
-        assert_eq!(
+        assert_eq!(result, vec![
-            result,
+            BackendServer {
-            vec![
+                address: "some-hostname.test.mcd".to_string(),
-                BackendServer {
+                port: 80,
-                    address: "some-hostname.test.mcd".to_string(),
+            },
-                    port: 80,
+            BackendServer {
-                },
+                address: "192.168.1.2".to_string(),
-                BackendServer {
+                port: 8080,
-                    address: "192.168.1.2".to_string(),
+            },
-                    port: 8080,
+        ]);
-                },
-            ]
-        );
     }
 }

harmony/src/modules/helm/chart.rs

@@ -6,7 +6,7 @@ use crate::topology::{HelmCommand, Topology};
 use async_trait::async_trait;
 use helm_wrapper_rs;
 use helm_wrapper_rs::blocking::{DefaultHelmExecutor, HelmExecutor};
-use log::{debug, info, warn};
+use log::{debug, error, info, warn};
 pub use non_blank_string_rs::NonBlankString;
 use serde::Serialize;
 use std::collections::HashMap;
@@ -104,7 +104,6 @@ impl HelmChartInterpret {
 
 fn run_helm_command(args: &[&str]) -> Result<Output, InterpretError> {
     let command_str = format!("helm {}", args.join(" "));
-    debug!("Got KUBECONFIG: `{}`", std::env::var("KUBECONFIG").unwrap());
     debug!("Running Helm command: `{}`", command_str);
 
     let output = Command::new("helm")
@@ -160,13 +159,8 @@ impl<T: Topology + HelmCommand> Interpret<T> for HelmChartInterpret {
 
         self.add_repo()?;
 
-        let helm_executor = DefaultHelmExecutor::new_with_opts(
+        let helm_path = NonBlankString::from_str("helm").unwrap();
-            &NonBlankString::from_str("helm").unwrap(),
+        let helm_executor = DefaultHelmExecutor::new_with_opts(&helm_path, None, 9000, false, false);
-            None,
-            900,
-            false,
-            false,
-        );
 
         let mut helm_options = Vec::new();
         if self.score.create_namespace {

harmony/src/modules/helm/command.rs

@@ -1,379 +0,0 @@
-use async_trait::async_trait;
-use log::debug;
-use non_blank_string_rs::NonBlankString;
-use serde::Serialize;
-use std::collections::HashMap;
-use std::env::temp_dir;
-use std::ffi::OsStr;
-use std::io::ErrorKind;
-use std::path::{Path, PathBuf};
-use std::process::{Command, Output};
-use temp_dir::{self, TempDir};
-use temp_file::TempFile;
-
-use crate::data::{Id, Version};
-use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome};
-use crate::inventory::Inventory;
-use crate::score::Score;
-use crate::topology::{HelmCommand, K8sclient, Topology};
-
-#[derive(Clone)]
-pub struct HelmCommandExecutor {
-    pub env: HashMap<String, String>,
-    pub path: Option<PathBuf>,
-    pub args: Vec<String>,
-    pub api_versions: Option<Vec<String>>,
-    pub kube_version: String,
-    pub debug: Option<bool>,
-    pub globals: HelmGlobals,
-    pub chart: HelmChart,
-}
-
-#[derive(Clone)]
-pub struct HelmGlobals {
-    pub chart_home: Option<PathBuf>,
-    pub config_home: Option<PathBuf>,
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct HelmChart {
-    pub name: String,
-    pub version: Option<String>,
-    pub repo: Option<String>,
-    pub release_name: Option<String>,
-    pub namespace: Option<String>,
-    pub additional_values_files: Vec<PathBuf>,
-    pub values_file: Option<PathBuf>,
-    pub values_inline: Option<String>,
-    pub include_crds: Option<bool>,
-    pub skip_hooks: Option<bool>,
-    pub api_versions: Option<Vec<String>>,
-    pub kube_version: Option<String>,
-    pub name_template: String,
-    pub skip_tests: Option<bool>,
-    pub debug: Option<bool>,
-}
-
-impl HelmCommandExecutor {
-    pub fn generate(mut self) -> Result<String, std::io::Error> {
-        if self.globals.chart_home.is_none() {
-            self.globals.chart_home = Some(PathBuf::from("charts"));
-        }
-
-        if self
-            .clone()
-            .chart
-            .clone()
-            .chart_exists_locally(self.clone().globals.chart_home.unwrap())
-            .is_none()
-        {
-            if self.chart.repo.is_none() {
-                return Err(std::io::Error::new(
-                    ErrorKind::Other,
-                    "Chart doesn't exist locally and no repo specified",
-                ));
-            }
-            self.clone().run_command(
-                self.chart
-                    .clone()
-                    .pull_command(self.globals.chart_home.clone().unwrap()),
-            )?;
-        }
-
-        let out = match self.clone().run_command(
-            self.chart
-                .clone()
-                .helm_args(self.globals.chart_home.clone().unwrap()),
-        ) {
-            Ok(out) => out,
-            Err(e) => return Err(e),
-        };
-
-        // TODO: don't use unwrap here
-        let s = String::from_utf8(out.stdout).unwrap();
-        debug!("helm stderr: {}", String::from_utf8(out.stderr).unwrap());
-        debug!("helm status: {}", out.status);
-        debug!("helm output: {s}");
-
-        let clean = s.split_once("---").unwrap().1;
-
-        Ok(clean.to_string())
-    }
-
-    pub fn version(self) -> Result<String, std::io::Error> {
-        let out = match self.run_command(vec![
-            "version".to_string(),
-            "-c".to_string(),
-            "--short".to_string(),
-        ]) {
-            Ok(out) => out,
-            Err(e) => return Err(e),
-        };
-
-        // TODO: don't use unwrap
-        Ok(String::from_utf8(out.stdout).unwrap())
-    }
-
-    pub fn run_command(mut self, mut args: Vec<String>) -> Result<Output, std::io::Error> {
-        if let Some(d) = self.debug {
-            if d {
-                args.push("--debug".to_string());
-            }
-        }
-
-        let path = if let Some(p) = self.path {
-            p
-        } else {
-            PathBuf::from("helm")
-        };
-
-        let config_home = match self.globals.config_home {
-            Some(p) => p,
-            None => PathBuf::from(TempDir::new()?.path()),
-        };
-
-        match self.chart.values_inline {
-            Some(yaml_str) => {
-                let tf: TempFile;
-                tf = temp_file::with_contents(yaml_str.as_bytes());
-                self.chart
-                    .additional_values_files
-                    .push(PathBuf::from(tf.path()));
-            }
-            None => (),
-        };
-
-        self.env.insert(
-            "HELM_CONFIG_HOME".to_string(),
-            config_home.to_str().unwrap().to_string(),
-        );
-        self.env.insert(
-            "HELM_CACHE_HOME".to_string(),
-            config_home.to_str().unwrap().to_string(),
-        );
-        self.env.insert(
-            "HELM_DATA_HOME".to_string(),
-            config_home.to_str().unwrap().to_string(),
-        );
-
-        Command::new(path).envs(self.env).args(args).output()
-    }
-}
-
-impl HelmChart {
-    pub fn chart_exists_locally(self, chart_home: PathBuf) -> Option<PathBuf> {
-        let chart_path =
-            PathBuf::from(chart_home.to_str().unwrap().to_string() + "/" + &self.name.to_string());
-
-        if chart_path.exists() {
-            Some(chart_path)
-        } else {
-            None
-        }
-    }
-
-    pub fn pull_command(self, chart_home: PathBuf) -> Vec<String> {
-        let mut args = vec![
-            "pull".to_string(),
-            "--untar".to_string(),
-            "--untardir".to_string(),
-            chart_home.to_str().unwrap().to_string(),
-        ];
-
-        match self.repo {
-            Some(r) => {
-                if r.starts_with("oci://") {
-                    args.push(String::from(
-                        r.trim_end_matches("/").to_string() + "/" + self.name.clone().as_str(),
-                    ));
-                } else {
-                    args.push("--repo".to_string());
-                    args.push(r.to_string());
-
-                    args.push(self.name);
-                }
-            }
-            None => args.push(self.name),
-        };
-
-        match self.version {
-            Some(v) => {
-                args.push("--version".to_string());
-                args.push(v.to_string());
-            }
-            None => (),
-        }
-
-        args
-    }
-
-    pub fn helm_args(self, chart_home: PathBuf) -> Vec<String> {
-        let mut args: Vec<String> = vec!["template".to_string()];
-
-        match self.release_name {
-            Some(rn) => args.push(rn.to_string()),
-            None => args.push("--generate-name".to_string()),
-        }
-
-        args.push(
-            PathBuf::from(chart_home.to_str().unwrap().to_string() + "/" + self.name.as_str())
-                .to_str()
-                .unwrap()
-                .to_string(),
-        );
-
-        if let Some(n) = self.namespace {
-            args.push("--namespace".to_string());
-            args.push(n.to_string());
-        }
-
-        if let Some(f) = self.values_file {
-            args.push("-f".to_string());
-            args.push(f.to_str().unwrap().to_string());
-        }
-
-        for f in self.additional_values_files {
-            args.push("-f".to_string());
-            args.push(f.to_str().unwrap().to_string());
-        }
-
-        if let Some(vv) = self.api_versions {
-            for v in vv {
-                args.push("--api-versions".to_string());
-                args.push(v);
-            }
-        }
-
-        if let Some(kv) = self.kube_version {
-            args.push("--kube-version".to_string());
-            args.push(kv);
-        }
-
-        if let Some(crd) = self.include_crds {
-            if crd {
-                args.push("--include-crds".to_string());
-            }
-        }
-
-        if let Some(st) = self.skip_tests {
-            if st {
-                args.push("--skip-tests".to_string());
-            }
-        }
-
-        if let Some(sh) = self.skip_hooks {
-            if sh {
-                args.push("--no-hooks".to_string());
-            }
-        }
-
-        if let Some(d) = self.debug {
-            if d {
-                args.push("--debug".to_string());
-            }
-        }
-
-        args
-    }
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct HelmChartScoreV2 {
-    pub chart: HelmChart,
-}
-
-impl<T: Topology + K8sclient + HelmCommand> Score<T> for HelmChartScoreV2 {
-    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
-        Box::new(HelmChartInterpretV2 {
-            score: self.clone(),
-        })
-    }
-
-    fn name(&self) -> String {
-        format!(
-            "{} {} HelmChartScoreV2",
-            self.chart
-                .release_name
-                .clone()
-                .unwrap_or("Unknown".to_string()),
-            self.chart.name
-        )
-    }
-}
-
-#[derive(Debug, Serialize)]
-pub struct HelmChartInterpretV2 {
-    pub score: HelmChartScoreV2,
-}
-impl HelmChartInterpretV2 {}
-
-#[async_trait]
-impl<T: Topology + K8sclient + HelmCommand> Interpret<T> for HelmChartInterpretV2 {
-    async fn execute(
-        &self,
-        _inventory: &Inventory,
-        _topology: &T,
-    ) -> Result<Outcome, InterpretError> {
-        let ns = self
-            .score
-            .chart
-            .namespace
-            .as_ref()
-            .unwrap_or_else(|| todo!("Get namespace from active kubernetes cluster"));
-
-        let helm_executor = HelmCommandExecutor {
-            env: HashMap::new(),
-            path: None,
-            args: vec![],
-            api_versions: None,
-            kube_version: "v1.33.0".to_string(),
-            debug: Some(false),
-            globals: HelmGlobals {
-                chart_home: None,
-                config_home: None,
-            },
-            chart: self.score.chart.clone(),
-        };
-
-        // let mut helm_options = Vec::new();
-        // if self.score.create_namespace {
-        //     helm_options.push(NonBlankString::from_str("--create-namespace").unwrap());
-        // }
-
-        let res = helm_executor.generate();
-
-        let output = match res {
-            Ok(output) => output,
-            Err(err) => return Err(InterpretError::new(err.to_string())),
-        };
-
-        // TODO: implement actually applying the YAML from the templating in the generate function to a k8s cluster, having trouble passing in straight YAML into the k8s client
-
-        // let k8s_resource = k8s_openapi::serde_json::from_str(output.as_str()).unwrap();
-
-        // let client = topology
-        //     .k8s_client()
-        //     .await
-        //     .expect("Environment should provide enough information to instanciate a client")
-        //     .apply_namespaced(&vec![output], Some(ns.to_string().as_str()));
-        // match client.apply_yaml(output) {
-        //     Ok(_) => return Ok(Outcome::success("Helm chart deployed".to_string())),
-        //     Err(e) => return Err(InterpretError::new(e)),
-        // }
-
-        Ok(Outcome::success("Helm chart deployed".to_string()))
-    }
-
-    fn get_name(&self) -> InterpretName {
-        todo!()
-    }
-    fn get_version(&self) -> Version {
-        todo!()
-    }
-    fn get_status(&self) -> InterpretStatus {
-        todo!()
-    }
-    fn get_children(&self) -> Vec<Id> {
-        todo!()
-    }
-}

harmony/src/modules/helm/mod.rs

@@ -1,2 +1 @@
 pub mod chart;
-pub mod command;

harmony/src/modules/k8s/deployment.rs

@@ -42,7 +42,7 @@ impl<T: Topology + K8sclient> Score<T> for K8sDeploymentScore {
                                 {
                                     "image": self.image,
                                     "name": self.name,
-                                    "imagePullPolicy": "Always",
+                                    "imagePullPolicy": "IfNotPresent",
                                     "env": self.env_vars,
                                 }
                             ]

harmony/src/modules/k8s/ingress.rs

@@ -1,98 +0,0 @@
-use harmony_macros::ingress_path;
-use k8s_openapi::api::networking::v1::Ingress;
-use serde::Serialize;
-use serde_json::json;
-
-use crate::{
-    interpret::Interpret,
-    score::Score,
-    topology::{K8sclient, Topology},
-};
-
-use super::resource::{K8sResourceInterpret, K8sResourceScore};
-
-#[derive(Debug, Clone, Serialize)]
-pub enum PathType {
-    ImplementationSpecific,
-    Exact,
-    Prefix,
-}
-
-impl PathType {
-    fn as_str(&self) -> &'static str {
-        match self {
-            PathType::ImplementationSpecific => "ImplementationSpecific",
-            PathType::Exact => "Exact",
-            PathType::Prefix => "Prefix",
-        }
-    }
-}
-
-type IngressPath = String;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct K8sIngressScore {
-    pub name: fqdn::FQDN,
-    pub host: fqdn::FQDN,
-    pub backend_service: fqdn::FQDN,
-    pub port: u16,
-    pub path: Option<IngressPath>,
-    pub path_type: Option<PathType>,
-    pub namespace: Option<fqdn::FQDN>,
-}
-
-impl<T: Topology + K8sclient> Score<T> for K8sIngressScore {
-    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
-        let path = match self.path.clone() {
-            Some(p) => p,
-            None => ingress_path!("/"),
-        };
-
-        let path_type = match self.path_type.clone() {
-            Some(p) => p,
-            None => PathType::Prefix,
-        };
-
-        let ingress = json!(
-            {
-                "metadata": {
-                    "name": self.name
-                },
-                "spec": {
-                    "rules": [
-                        {   "host": self.host,
-                            "http": {
-                                "paths": [
-                                    {
-                                        "path": path,
-                                        "pathType": path_type.as_str(),
-                                        "backend": [
-                                            {
-                                                "service": self.backend_service,
-                                                "port": self.port
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                }
-            }
-        );
-
-        let ingress: Ingress = serde_json::from_value(ingress).unwrap();
-        Box::new(K8sResourceInterpret {
-            score: K8sResourceScore::single(
-                ingress.clone(),
-                self.namespace
-                    .clone()
-                    .map(|f| f.as_c_str().to_str().unwrap().to_string()),
-            ),
-        })
-    }
-
-    fn name(&self) -> String {
-        format!("{} K8sIngressScore", self.name)
-    }
-}

harmony/src/modules/k8s/mod.rs

@@ -1,4 +1,3 @@
 pub mod deployment;
-pub mod ingress;
 pub mod namespace;
 pub mod resource;

harmony/src/modules/lamp.rs

@@ -1,8 +1,6 @@
 use convert_case::{Case, Casing};
 use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, WORKDIR};
 use dockerfile_builder::{Dockerfile, instruction_builder::EnvBuilder};
-use fqdn::fqdn;
-use harmony_macros::ingress_path;
 use non_blank_string_rs::NonBlankString;
 use serde_json::json;
 use std::collections::HashMap;
@@ -15,7 +13,6 @@ use log::{debug, info};
 use serde::Serialize;
 
 use crate::config::{REGISTRY_PROJECT, REGISTRY_URL};
-use crate::modules::k8s::ingress::K8sIngressScore;
 use crate::topology::HelmCommand;
 use crate::{
     data::{Id, Version},
@@ -41,7 +38,6 @@ pub struct LAMPConfig {
     pub project_root: PathBuf,
     pub ssl_enabled: bool,
     pub database_size: Option<String>,
-    pub namespace: String,
 }
 
 impl Default for LAMPConfig {
@@ -50,7 +46,6 @@ impl Default for LAMPConfig {
             project_root: Path::new("./src").to_path_buf(),
             ssl_enabled: true,
             database_size: None,
-            namespace: "harmony-lamp".to_string(),
         }
     }
 }
@@ -59,6 +54,7 @@ impl<T: Topology + K8sclient + HelmCommand> Score<T> for LAMPScore {
     fn create_interpret(&self) -> Box<dyn Interpret<T>> {
         Box::new(LAMPInterpret {
             score: self.clone(),
+            namespace: "harmony-lamp".to_string(),
         })
     }
 
@@ -70,6 +66,7 @@ impl<T: Topology + K8sclient + HelmCommand> Score<T> for LAMPScore {
 #[derive(Debug)]
 pub struct LAMPInterpret {
     score: LAMPScore,
+    namespace: String,
 }
 
 #[async_trait]
@@ -135,32 +132,7 @@ impl<T: Topology + K8sclient + HelmCommand> Interpret<T> for LAMPInterpret {
 
         info!("LAMP deployment_score {deployment_score:?}");
 
-        let lamp_ingress = K8sIngressScore {
+        Ok(Outcome::success("Successfully deployed LAMP Stack!".to_string()))
-            name: fqdn!("lamp-ingress"),
-            host: fqdn!("test"),
-            backend_service: fqdn!(
-                <LAMPScore as Score<T>>::name(&self.score)
-                    .to_case(Case::Kebab)
-                    .as_str()
-            ),
-            port: 8080,
-            path: Some(ingress_path!("/")),
-            path_type: None,
-            namespace: self
-                .get_namespace()
-                .map(|nbs| fqdn!(nbs.to_string().as_str())),
-        };
-
-        lamp_ingress
-            .create_interpret()
-            .execute(inventory, topology)
-            .await?;
-
-        info!("LAMP lamp_ingress {lamp_ingress:?}");
-
-        Ok(Outcome::success(
-            "Successfully deployed LAMP Stack!".to_string(),
-        ))
     }
 
     fn get_name(&self) -> InterpretName {
@@ -192,10 +164,6 @@ impl LAMPInterpret {
                 NonBlankString::from_str("primary.persistence.size").unwrap(),
                 database_size,
             );
-            values_overrides.insert(
-                NonBlankString::from_str("auth.rootPassword").unwrap(),
-                "mariadb-changethis".to_string(),
-            );
         }
         let score = HelmChartScore {
             namespace: self.get_namespace(),
@@ -208,7 +176,7 @@ impl LAMPInterpret {
             chart_version: None,
             values_overrides: Some(values_overrides),
             create_namespace: true,
-            install_only: false,
+            install_only: true,
             values_yaml: None,
             repository: None,
         };
@@ -263,9 +231,6 @@ impl LAMPInterpret {
                 opcache",
         ));
 
-        dockerfile.push(RUN::from(r#"sed -i 's/VirtualHost \*:80/VirtualHost *:8080/' /etc/apache2/sites-available/000-default.conf && \
-                sed -i 's/^Listen 80$/Listen 8080/' /etc/apache2/ports.conf"#));
-
         // Copy PHP configuration
         dockerfile.push(RUN::from("mkdir -p /usr/local/etc/php/conf.d/"));
 
@@ -331,7 +296,7 @@ opcache.fast_shutdown=1
         dockerfile.push(RUN::from("chown -R appuser:appuser /var/www/html"));
 
         // Expose Apache port
-        dockerfile.push(EXPOSE::from("8080/tcp"));
+        dockerfile.push(EXPOSE::from("80/tcp"));
 
         // Set the default command
         dockerfile.push(CMD::from("apache2-foreground"));
@@ -415,6 +380,6 @@ opcache.fast_shutdown=1
     }
 
     fn get_namespace(&self) -> Option<NonBlankString> {
-        Some(NonBlankString::from_str(&self.score.config.namespace).unwrap())
+        Some(NonBlankString::from_str(&self.namespace).unwrap())
     }
 }

harmony/src/modules/mod.rs

@@ -9,7 +9,7 @@ pub mod k3d;
 pub mod k8s;
 pub mod lamp;
 pub mod load_balancer;
-pub mod monitoring;
 pub mod okd;
 pub mod opnsense;
 pub mod tftp;
+pub mod monitoring;

harmony/src/modules/monitoring/config.rs

@@ -1,53 +1,37 @@
-use serde::Serialize;
+#[derive(Debug, Clone)]
-
+pub struct KubePrometheusConfig {
-use super::kube_prometheus::{prometheus_alert_channel::PrometheusAlertChannel, types::AlertManagerValues};
-
-
-
-#[derive(Debug, Clone, Serialize)]
-pub struct KubePrometheusChartConfig {
     pub namespace: String,
-    pub default_rules: bool,
-    pub windows_monitoring: bool,
-    pub alert_manager: bool,
-    pub alert_manager_values: AlertManagerValues,
     pub node_exporter: bool,
+    pub alert_manager: bool,
     pub prometheus: bool,
     pub grafana: bool,
+    pub windows_monitoring: bool,
     pub kubernetes_service_monitors: bool,
-    pub kubernetes_api_server: bool,
     pub kubelet: bool,
     pub kube_controller_manager: bool,
-    pub core_dns: bool,
     pub kube_etcd: bool,
-    pub kube_scheduler: bool,
     pub kube_proxy: bool,
     pub kube_state_metrics: bool,
     pub prometheus_operator: bool,
-    pub alert_channels: Vec<Box<dyn PrometheusAlertChannel>>,
 }
-impl KubePrometheusChartConfig {
+
-    pub fn new() -> Self {
+impl Default for KubePrometheusConfig {
+    fn default() -> Self {
         Self {
             namespace: "monitoring".into(),
-            default_rules: true,
-            windows_monitoring: false,
-            alert_manager: true,
-            alert_manager_values: AlertManagerValues::default(),
-            alert_channels: Vec::new(),
-            grafana: true,
             node_exporter: false,
+            alert_manager: false,
             prometheus: true,
+            grafana: true,
+            windows_monitoring: false,
             kubernetes_service_monitors: true,
-            kubernetes_api_server: false,
+            kubelet: true,
-            kubelet: false,
+            kube_controller_manager: true,
-            kube_controller_manager: false,
+            kube_etcd: true,
-            kube_etcd: false,
+            kube_proxy: true,
-            kube_proxy: false,
             kube_state_metrics: true,
             prometheus_operator: true,
-            core_dns: false,
-            kube_scheduler: false,
         }
     }
 }
+

harmony/src/modules/monitoring/discord_alert_manager.rs

@@ -1,32 +0,0 @@
-use std::str::FromStr;
-
-use non_blank_string_rs::NonBlankString;
-use url::Url;
-
-use crate::modules::helm::chart::HelmChartScore;
-
-pub fn discord_alert_manager_score(name: String, webhook: Url, namespace: String) -> HelmChartScore {
-    let url = webhook;
-    let values = format!(
-        r#"
- environment:
-   - name: "DISCORD_WEBHOOK"
-     value: "{url}"
- "#,
-    );
-
-    HelmChartScore {
-        namespace: Some(NonBlankString::from_str(&namespace).unwrap()),
-        release_name: NonBlankString::from_str(&name).unwrap(),
-        chart_name: NonBlankString::from_str(
-            "oci://hub.nationtech.io/library/alertmanager-discord",
-        )
-        .unwrap(),
-        chart_version: None,
-        values_overrides: None,
-        values_yaml: Some(values.to_string()),
-        create_namespace: true,
-        install_only: true,
-        repository: None,
-    }
-}

harmony/src/modules/monitoring/kube_prometheus.rs

@@ -0,0 +1,75 @@
+use std::{collections::HashMap, str::FromStr};
+
+use non_blank_string_rs::NonBlankString;
+
+use crate::modules::helm::chart::HelmChartScore;
+
+use super::config::KubePrometheusConfig;
+
+pub fn kube_prometheus_score(config: KubePrometheusConfig) -> HelmChartScore {
+    //TODO this should be make into a rule with default formatting that can be easily passed as a vec
+    //to the overrides or something leaving the user to deal with formatting here seems bad
+    let values = r#"
+additionalPrometheusRulesMap:
+  pvc-alerts:
+    groups:
+      - name: pvc-alerts
+        rules:
+          - alert: 'PVC Fill Over 95 Percent In 2 Days'
+            expr: |
+              (
+                kubelet_volume_stats_used_bytes 
+                / 
+                kubelet_volume_stats_capacity_bytes
+              ) > 0.95
+              AND
+              predict_linear(kubelet_volume_stats_used_bytes[2d], 2 * 24 * 60 * 60)
+              / 
+              kubelet_volume_stats_capacity_bytes 
+              > 0.95
+            for: 1m
+            labels:
+              severity: warning
+            annotations:
+              description: The PVC {{ $labels.persistentvolumeclaim }} in namespace {{ $labels.namespace }} is predicted to fill over 95% in less than 2 days.
+              title: PVC {{ $labels.persistentvolumeclaim }} in namespace {{ $labels.namespace }} will fill over 95% in less than 2 days
+"#;
+    let mut values_overrides: HashMap<NonBlankString, String> = HashMap::new();
+
+
+    macro_rules! insert_flag {
+        ($key:expr, $val:expr) => {
+            values_overrides.insert(NonBlankString::from_str($key).unwrap(), $val.to_string());
+        };
+    }
+
+    insert_flag!("nodeExporter.enabled", config.node_exporter);
+    insert_flag!("windowsMonitoring.enabled", config.windows_monitoring);
+    insert_flag!("grafana.enabled", config.grafana);
+    insert_flag!("alertmanager.enabled", config.alert_manager);
+    insert_flag!("prometheus.enabled", config.prometheus);
+    insert_flag!("kubernetes_service_monitors.enabled", config.kubernetes_service_monitors);
+    insert_flag!("kubelet.enabled", config.kubelet);
+    insert_flag!("kubeControllerManager.enabled", config.kube_controller_manager);
+    insert_flag!("kubeProxy.enabled", config.kube_proxy);
+    insert_flag!("kubeEtcd.enabled", config.kube_etcd);
+    insert_flag!("kubeStateMetrics.enabled", config.kube_state_metrics);
+    insert_flag!("prometheusOperator.enabled", config.prometheus_operator);
+
+    
+    HelmChartScore {
+        namespace: Some(NonBlankString::from_str(&config.namespace).unwrap()),
+        release_name: NonBlankString::from_str("kube-prometheus").unwrap(),
+        chart_name: NonBlankString::from_str(
+            "oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack", //use kube prometheus chart which includes grafana, prometheus, alert
+                                                                               //manager, etc
+        )
+        .unwrap(),
+        chart_version: None,
+        values_overrides: Some(values_overrides),
+        values_yaml: Some(values.to_string()),
+        create_namespace: true,
+        install_only: true,
+        repository: None,
+    }
+}

harmony/src/modules/monitoring/kube_prometheus/kube_prometheus.rs

@@ -1,168 +0,0 @@
-use crate::modules::{helm::chart::HelmChartScore, monitoring::config::KubePrometheusChartConfig};
-use log::info;
-use non_blank_string_rs::NonBlankString;
-use serde_yaml::{self};
-use std::str::FromStr;
-
-pub fn kube_prometheus_helm_chart_score(config: &KubePrometheusChartConfig) -> HelmChartScore {
-    //TODO this should be make into a rule with default formatting that can be easily passed as a vec
-    //to the overrides or something leaving the user to deal with formatting here seems bad
-    let default_rules = config.default_rules.to_string();
-    let windows_monitoring = config.windows_monitoring.to_string();
-    let grafana = config.grafana.to_string();
-    let kubernetes_service_monitors = config.kubernetes_service_monitors.to_string();
-    let kubernetes_api_server = config.kubernetes_api_server.to_string();
-    let kubelet = config.kubelet.to_string();
-    let kube_controller_manager = config.kube_controller_manager.to_string();
-    let core_dns = config.core_dns.to_string();
-    let kube_etcd = config.kube_etcd.to_string();
-    let kube_scheduler = config.kube_scheduler.to_string();
-    let kube_proxy = config.kube_proxy.to_string();
-    let kube_state_metrics = config.kube_state_metrics.to_string();
-    let node_exporter = config.node_exporter.to_string();
-    let prometheus_operator = config.prometheus_operator.to_string();
-    let prometheus = config.prometheus.to_string();
-    let alert_manager_values = config.alert_manager_values.clone();
-    let mut values = format!(
-        r#"
-additionalPrometheusRulesMap:
-  pods-status-alerts:
-    groups:
-      - name: pods
-        rules:
-          - alert: "[CRIT] POD not healthy"
-            expr: min_over_time(sum by (namespace, pod) (kube_pod_status_phase{{phase=~"Pending|Unknown|Failed"}})[15m:1m]) > 0
-            for: 0m
-            labels:
-              severity: critical
-            annotations:
-              title: "[CRIT] POD not healthy : {{{{ $labels.pod }}}}"
-              description: |
-               A POD is in a non-ready state!
-               - **Pod**: {{{{ $labels.pod }}}}
-               - **Namespace**: {{{{ $labels.namespace }}}}
-          - alert: "[CRIT] POD crash looping"
-            expr: increase(kube_pod_container_status_restarts_total[5m]) > 3
-            for: 0m
-            labels:
-              severity: critical
-            annotations:
-              title: "[CRIT] POD crash looping : {{{{ $labels.pod }}}}"
-              description: |
-               A POD is drowning in a crash loop!
-               - **Pod**: {{{{ $labels.pod }}}}
-               - **Namespace**: {{{{ $labels.namespace }}}}
-               - **Instance**: {{{{ $labels.instance }}}}
-  pvc-alerts:
-    groups:
-      - name: pvc-alerts
-        rules:
-          - alert: 'PVC Fill Over 95 Percent In 2 Days'
-            expr: |
-              (
-                kubelet_volume_stats_used_bytes 
-                / 
-                kubelet_volume_stats_capacity_bytes
-              ) > 0.95
-              AND
-              predict_linear(kubelet_volume_stats_used_bytes[2d], 2 * 24 * 60 * 60)
-              / 
-              kubelet_volume_stats_capacity_bytes 
-              > 0.95
-            for: 1m
-            labels:
-              severity: warning
-            annotations:
-              description: The PVC {{{{ $labels.persistentvolumeclaim }}}} in namespace {{{{ $labels.namespace }}}} is predicted to fill over 95% in less than 2 days.
-              title: PVC {{{{ $labels.persistentvolumeclaim }}}} in namespace {{{{ $labels.namespace }}}} will fill over 95% in less than 2 days
-defaultRules:
-  create: {default_rules}
-  rules:
-    alertmanager: true
-    etcd: true
-    configReloaders: true
-    general: true
-    k8sContainerCpuUsageSecondsTotal: true
-    k8sContainerMemoryCache: true
-    k8sContainerMemoryRss: true
-    k8sContainerMemorySwap: true
-    k8sContainerResource: true
-    k8sContainerMemoryWorkingSetBytes: true
-    k8sPodOwner: true
-    kubeApiserverAvailability: true
-    kubeApiserverBurnrate: true
-    kubeApiserverHistogram: true
-    kubeApiserverSlos: true
-    kubeControllerManager: true
-    kubelet: true
-    kubeProxy: true
-    kubePrometheusGeneral: true
-    kubePrometheusNodeRecording: true
-    kubernetesApps: true
-    kubernetesResources: true
-    kubernetesStorage: true
-    kubernetesSystem: true
-    kubeSchedulerAlerting: true
-    kubeSchedulerRecording: true
-    kubeStateMetrics: true
-    network: true
-    node: true
-    nodeExporterAlerting: true
-    nodeExporterRecording: true
-    prometheus: true
-    prometheusOperator: true
-    windows: true
-windowsMonitoring:
-  enabled: {windows_monitoring}
-grafana:
-  enabled: {grafana}
-kubernetesServiceMonitors:
-  enabled: {kubernetes_service_monitors}
-kubeApiServer:
-  enabled: {kubernetes_api_server}
-kubelet:
-  enabled: {kubelet}
-kubeControllerManager:
-  enabled: {kube_controller_manager}
-coreDns:
-  enabled: {core_dns}
-kubeEtcd:
-  enabled: {kube_etcd}
-kubeScheduler:
-  enabled: {kube_scheduler}
-kubeProxy:
-  enabled: {kube_proxy}
-kubeStateMetrics:
-  enabled: {kube_state_metrics}
-nodeExporter:
-  enabled: {node_exporter}
-prometheusOperator:
-  enabled: {prometheus_operator}
-prometheus:
-  enabled: {prometheus}
-  prometheusSpec:
-    maximumStartupDurationSeconds: 240
-"#,
-    );
-
-    let alert_manager_yaml = serde_yaml::to_string(&alert_manager_values).expect("Failed to serialize YAML");
-    values.push_str(&alert_manager_yaml);
-
-
-    info!("{}", values);
-
-    HelmChartScore {
-        namespace: Some(NonBlankString::from_str(&config.namespace).unwrap()),
-        release_name: NonBlankString::from_str("kube-prometheus").unwrap(),
-        chart_name: NonBlankString::from_str(
-            "oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack",
-        )
-        .unwrap(),
-        chart_version: None,
-        values_overrides: None,
-        values_yaml: Some(values.to_string()),
-        create_namespace: true,
-        install_only: true,
-        repository: None,
-    }
-}

harmony/src/modules/monitoring/kube_prometheus/mod.rs

@@ -1,3 +0,0 @@
-pub mod kube_prometheus;
-pub mod types;
-pub mod prometheus_alert_channel;

harmony/src/modules/monitoring/kube_prometheus/prometheus_alert_channel.rs

@@ -1,140 +0,0 @@
-use crate::{
-    interpret::InterpretError,
-    modules::{
-        helm::chart::HelmChartScore,
-        monitoring::{
-            discord_alert_manager::discord_alert_manager_score,
-            kube_prometheus::types::{
-                AlertChannelConfig, AlertChannelGlobalConfig, AlertChannelReceiver,
-                AlertChannelRoute, SlackConfig, WebhookConfig,
-            },
-        },
-    },
-};
-use dyn_clone::DynClone;
-use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
-use url::Url;
-
-#[typetag::serde(tag = "channel_type")]
-#[async_trait::async_trait]
-pub trait PrometheusAlertChannel: DynClone + Debug + Send + Sync {
-    fn get_alert_manager_config_contribution(&self) -> Result<AlertChannelConfig, InterpretError>;
-
-    fn get_dependency_score(&self, namespace:String) -> Option<HelmChartScore>;
-}
-
-dyn_clone::clone_trait_object!(PrometheusAlertChannel);
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DiscordChannel {
-    pub name: String,
-    pub webhook_url: Url,
-}
-
-#[typetag::serde]
-impl PrometheusAlertChannel for DiscordChannel {
-    fn get_alert_manager_config_contribution(&self) -> Result<AlertChannelConfig, InterpretError> {
-        let service_url = format!("http://{}-alertmanager-discord:9094", &self.name);
-        Ok(AlertChannelConfig {
-            receiver: AlertChannelReceiver {
-                name: format!("Discord-{}", self.name),
-                slack_configs: None,
-                webhook_configs: Some(vec![WebhookConfig {
-                    url: url::Url::parse(&service_url)
-                        .expect("invalid url"),
-                    send_resolved: true,
-                }]),
-            },
-            route: AlertChannelRoute {
-                receiver: format!("Discord-{}", self.name),
-                matchers: vec!["alertname!=Watchdog".to_string()],
-                r#continue: true,
-            },
-            global_config: None,
-        })
-    }
-    fn get_dependency_score(&self, namespace: String) -> Option<HelmChartScore> {
-        Some(discord_alert_manager_score(self.name.clone(), self.webhook_url.clone(), namespace.clone()))
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SlackChannel {
-    pub name: String,
-    pub webhook_url: Url,
-}
-
-#[typetag::serde]
-impl PrometheusAlertChannel for SlackChannel {
-    fn get_alert_manager_config_contribution(&self) -> Result<AlertChannelConfig, InterpretError> {
-        Ok(AlertChannelConfig {
-            receiver: AlertChannelReceiver {
-                name: format!("Slack-{}", self.name),
-                slack_configs: Some(vec![SlackConfig {
-                    channel: self.name.clone(),
-                    send_resolved: true,
-                    title: "{{ .CommonAnnotations.title }}".to_string(),
-                    text: ">-
-  *Alert:* {{ .CommonLabels.alertname }}
-  *Severity:* {{ .CommonLabels.severity }}
-  *Namespace:* {{ .CommonLabels.namespace }}
-  *Pod:* {{ .CommonLabels.pod }}
-  *ExternalURL:* {{ .ExternalURL }}
-
-  {{ range .Alerts }}
-    *Instance:* {{ .Labels.instance }}
-    *Summary:* {{ .Annotations.summary }}
-    *Description:* {{ .Annotations.description }}
-    *Starts At:* {{ .StartsAt }}
-    *Status:* {{ .Status }}
-  {{ end }}"
-                        .to_string(),
-                }]),
-                webhook_configs: None,
-            },
-            route: AlertChannelRoute {
-                receiver: format!("Slack-{}", self.name),
-                matchers: vec!["alertname!=Watchdog".to_string()],
-                r#continue: true,
-            },
-            global_config: Some(AlertChannelGlobalConfig {
-                slack_api_url: Some(self.webhook_url.clone()),
-            }),
-        })
-    }
-    fn get_dependency_score(&self, _namespace: String) -> Option<HelmChartScore> {
-        None
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct NullReceiver {}
-
-impl NullReceiver {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-#[typetag::serde]
-impl PrometheusAlertChannel for NullReceiver {
-    fn get_alert_manager_config_contribution(&self) -> Result<AlertChannelConfig, InterpretError> {
-        Ok(AlertChannelConfig {
-            receiver: AlertChannelReceiver {
-                name: "null".to_string(),
-                slack_configs: None,
-                webhook_configs: None,
-            },
-            route: AlertChannelRoute {
-                receiver: "null".to_string(),
-                matchers: vec!["alertname=Watchdog".to_string()],
-                r#continue: false,
-            },
-            global_config: None,
-        })
-    }
-    fn get_dependency_score(&self, _namespace: String) -> Option<HelmChartScore> {
-        None
-    }
-}

harmony/src/modules/monitoring/kube_prometheus/types.rs

@@ -1,94 +0,0 @@
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertManagerValues {
-    pub alertmanager: AlertManager,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertManager {
-    pub enabled: bool,
-    pub config: AlertManagerConfig,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AlertChannelConfig {
-    pub receiver: AlertChannelReceiver,
-    pub route: AlertChannelRoute,
-    pub global_config: Option<AlertChannelGlobalConfig>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertChannelReceiver {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub slack_configs: Option<Vec<SlackConfig>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub webhook_configs: Option<Vec<WebhookConfig>>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertManagerRoute {
-    pub group_by: Vec<String>,
-    pub group_wait: String,
-    pub group_interval: String,
-    pub repeat_interval: String,
-    pub routes: Vec<AlertChannelRoute>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertChannelGlobalConfig {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub slack_api_url: Option<Url>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SlackConfig {
-    pub channel: String,
-    pub send_resolved: bool,
-    pub title: String,
-    pub text: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct WebhookConfig {
-    pub url: Url,
-    pub send_resolved: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertChannelRoute {
-    pub receiver: String,
-    pub matchers: Vec<String>,
-    #[serde(default)]
-    pub r#continue: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AlertManagerConfig {
-    pub global: Option<AlertChannelGlobalConfig>,
-    pub route: AlertManagerRoute,
-    pub receivers: Vec<AlertChannelReceiver>,
-}
-
-impl AlertManagerValues {
-    pub fn default() -> Self {
-        Self {
-            alertmanager: AlertManager {
-                enabled: true,
-                config: AlertManagerConfig {
-                    global: None,
-                    route: AlertManagerRoute {
-                        group_by: vec!["job".to_string()],
-                        group_wait: "30s".to_string(),
-                        group_interval: "5m".to_string(),
-                        repeat_interval: "12h".to_string(),
-                        routes: vec![AlertChannelRoute{ receiver: "null".to_string(), matchers: vec!["alertname=Watchdog".to_string()], r#continue: false }],
-                    },
-                    receivers: vec![AlertChannelReceiver{ name: "null".to_string(), slack_configs: None, webhook_configs: None }],
-                },
-            },
-        }
-    }
-}

harmony/src/modules/monitoring/mod.rs

@@ -1,5 +1,4 @@
-mod config;
-mod discord_alert_manager;
-pub mod kube_prometheus;
 pub mod monitoring_alerting;
+mod config;
+mod kube_prometheus;
 

harmony/src/modules/monitoring/monitoring_alerting.rs

@@ -1,188 +1,47 @@
 use async_trait::async_trait;
-
 use log::info;
 use serde::Serialize;
 
 use crate::{
-    data::{Id, Version},
+    interpret::Interpret,
-    interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
+    modules::helm::chart::HelmChartScore,
-    inventory::Inventory,
+    score::{CloneBoxScore, Score, SerializeScore},
-    modules::monitoring::kube_prometheus::types::{
-        AlertManager, AlertManagerConfig, AlertManagerRoute,
-    },
-    score::Score,
     topology::{HelmCommand, Topology},
 };
 
-use super::{
+use super::{config::KubePrometheusConfig, kube_prometheus::kube_prometheus_score};
-    config::KubePrometheusChartConfig,
-    kube_prometheus::{
-        kube_prometheus::kube_prometheus_helm_chart_score,
-        prometheus_alert_channel::{NullReceiver, PrometheusAlertChannel},
-        types::AlertManagerValues,
-    },
-};
 
 #[derive(Debug, Clone, Serialize)]
-pub struct MonitoringAlertingScore {
+pub struct KubePrometheusStackScore {
-    pub alert_channels: Vec<Box<dyn PrometheusAlertChannel>>,
+    pub monitoring_stack: HelmChartScore,
-    pub namespace: Option<String>,
+    
 }
 
-impl MonitoringAlertingScore {
+impl KubePrometheusStackScore {
-    pub fn new() -> Self {
+    pub fn new(monitoring_stack: HelmChartScore) -> Self {
         Self {
-            alert_channels: Vec::new(),
+            monitoring_stack,
-            namespace: None,
         }
     }
 }
 
-impl<T: Topology + HelmCommand> Score<T> for MonitoringAlertingScore {
+impl Default for KubePrometheusStackScore {
-    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
+    fn default() -> Self {
-        Box::new(MonitoringAlertingInterpret {
+        let config = KubePrometheusConfig::default();
-            score: self.clone(),
+        let monitoring_stack = kube_prometheus_score(config);
-        })
+        
+        Self {
+           monitoring_stack 
+        }
     }
+}
+
+impl<T: Topology + HelmCommand> Score<T> for KubePrometheusStackScore {
     fn name(&self) -> String {
         format!("MonitoringAlertingStackScore")
     }
-}
 
-#[derive(Debug, Clone, Serialize)]
+    fn create_interpret(&self) -> Box<dyn Interpret<T>> {
-struct MonitoringAlertingInterpret {
+        self.monitoring_stack.create_interpret()
-    score: MonitoringAlertingScore,
-}
-
-impl MonitoringAlertingInterpret {
-    async fn build_kube_prometheus_helm_chart_config(&self) -> KubePrometheusChartConfig {
-        let mut config = KubePrometheusChartConfig::new();
-        let mut receivers = Vec::new();
-        let mut routes = Vec::new();
-        let mut global_config = None;
-
-        if let Some(ns) = &self.score.namespace {
-            config.namespace = ns.clone();
-        };
-
-        let null_channel = NullReceiver::new();
-        let null_channel = null_channel
-            .get_alert_manager_config_contribution()
-            .unwrap();
-        receivers.push(null_channel.receiver);
-        routes.push(null_channel.route);
-
-        for channel in self.score.alert_channels.clone() {
-            let alert_manager_config_contribution =
-                channel.get_alert_manager_config_contribution().unwrap();
-            receivers.push(alert_manager_config_contribution.receiver);
-            routes.push(alert_manager_config_contribution.route);
-            if let Some(global) = alert_manager_config_contribution.global_config {
-                global_config = Some(global);
-            }
-        }
-
-        info!("after alert receiver: {:#?}", receivers);
-        info!("after alert routes: {:#?}", routes);
-
-        let alert_manager_config = AlertManagerConfig {
-            global: global_config,
-            route: AlertManagerRoute {
-                group_by: vec!["job".to_string()],
-                group_wait: "30s".to_string(),
-                group_interval: "5m".to_string(),
-                repeat_interval: "12h".to_string(),
-                routes,
-            },
-            receivers,
-        };
-
-        info!("alert manager config: {:?}", config);
-
-        config.alert_manager_values = AlertManagerValues {
-            alertmanager: AlertManager {
-                enabled: true,
-                config: alert_manager_config,
-            },
-        };
-        config
-    }
-
-    async fn deploy_kube_prometheus_helm_chart_score<T: Topology + HelmCommand>(
-        &self,
-        inventory: &Inventory,
-        topology: &T,
-        config: &KubePrometheusChartConfig,
-    ) -> Result<Outcome, InterpretError> {
-        let helm_chart = kube_prometheus_helm_chart_score(config);
-        helm_chart
-            .create_interpret()
-            .execute(inventory, topology)
-            .await
-    }
-
-    async fn deploy_alert_channel_dependencies<T: Topology + HelmCommand>(
-        &self,
-        inventory: &Inventory,
-        topology: &T,
-        config: &KubePrometheusChartConfig,
-    ) -> Result<Outcome, InterpretError> {
-        let mut outcomes = Vec::new();
-
-        for channel in &self.score.alert_channels {
-            let ns = config.namespace.clone();
-            if let Some(dependency_score) = channel.get_dependency_score(ns) {
-                match dependency_score
-                    .create_interpret()
-                    .execute(inventory, topology)
-                    .await
-                {
-                    Ok(outcome) => outcomes.push(outcome),
-                    Err(e) => {
-                        info!("failed to deploy dependency: {}", { &e });
-                        return Err(e);
-                    }
-                }
-            }
-        }
-
-        Ok(Outcome::success("All alert channels deployed".to_string()))
-    }
-}
-
-#[async_trait]
-impl<T: Topology + HelmCommand> Interpret<T> for MonitoringAlertingInterpret {
-    async fn execute(
-        &self,
-        inventory: &Inventory,
-        topology: &T,
-    ) -> Result<Outcome, InterpretError> {
-        let config = self.build_kube_prometheus_helm_chart_config().await;
-        info!("Built kube prometheus config{:?}", config);
-        info!("Installing kube prometheus chart");
-        self.deploy_kube_prometheus_helm_chart_score(inventory, topology, &config)
-            .await?;
-        info!("Installing alert channel service");
-        self.deploy_alert_channel_dependencies(inventory, topology, &config)
-            .await?;
-        Ok(Outcome::success(format!(
-            "succesfully deployed monitoring and alerting score"
-        )))
-    }
-
-    fn get_name(&self) -> InterpretName {
-        todo!()
-    }
-
-    fn get_version(&self) -> Version {
-        todo!()
-    }
-
-    fn get_status(&self) -> InterpretStatus {
-        todo!()
-    }
-
-    fn get_children(&self) -> Vec<Id> {
-        todo!()
     }
 }

harmony_macros/src/lib.rs

@@ -116,19 +116,3 @@ pub fn yaml(input: TokenStream) -> TokenStream {
     }
     .into()
 }
-
-/// Verify that a string is a valid(ish) ingress path
-/// Panics if path does not start with `/`
-#[proc_macro]
-pub fn ingress_path(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as LitStr);
-    let path_str = input.value();
-
-    match path_str.starts_with("/") {
-        true => {
-            let expanded = quote! {(#path_str.to_string()) };
-            return TokenStream::from(expanded);
-        }
-        false => panic!("Invalid ingress path"),
-    }
-}