From 7419d215c03d0fc677b5227d826afbb570d215b3 Mon Sep 17 00:00:00 2001 From: Filippe Spolti Date: Mon, 20 Nov 2023 12:56:05 -0300 Subject: [PATCH 1/2] chore: Update Bouncy Castle (#122) chore: Update bouncy castle depdendency to address the following vulnerability: - [CVE-2023-33201](https://nvd.nist.gov/vuln/detail/CVE-2023-33201): Bouncy Castle For Java LDAP injection vulnerability Signed-off-by: Spolti --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 07e177bc4..234060f45 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 0.9.0 - 1.70 + 1.74 5.10.0 ${project.build.directory}/dockerhome @@ -450,7 +450,7 @@ generate a self-signed server certificate --> org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${bouncycastle-version} From 68677c6f86316d4d7cae30c05b0c6442ecefd531 Mon Sep 17 00:00:00 2001 From: Nick Hill Date: Mon, 20 Nov 2023 09:13:09 -0800 Subject: [PATCH 2/2] docs: Add `per_model_metrics` parameter to metrics.md (#126) Functionality added in #90 --------- Signed-off-by: Nick Hill --- docs/metrics.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/metrics.md b/docs/metrics.md index b999135c0..fc312d89d 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -11,11 +11,13 @@ The `MM_METRICS` env variable can be used to configure or disable how metrics ar | | Purpose | Applies to | Default | |:------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------:|:----------------------------------:| -| `port` | Port on which to send or serve metrics | statsd (UDP push), prometheus (HTTP/HTTPS serve) | 8126 (statsd), 2112 (prometheus) | -| `fq_names` | Whether to use fully-qualified method names in request metrics | statsd, prometheus | false | -| `legacy` | Whether to publish legacy flavour (non-Sysdig) statsd metrics. Note that the legacy metrics are equivalent but have different names to those in the table below | statsd | false | -| `scheme` | Protocol scheme to use for Prometheus metrics, can be http or https | prometheus | https | +| `port` | Port on which to send or serve metrics | statsd (UDP push), prometheus (HTTP/HTTPS serve) | `8126` (statsd), `2112` (prometheus)| +| `fq_names` | Whether to use fully-qualified method names in request metrics | statsd, prometheus | `false` | +| `legacy` | Whether to publish legacy flavour (non-Sysdig) statsd metrics. Note that the legacy metrics are equivalent but have different names to those in the table below | statsd | `false` | +| `scheme` | Protocol scheme to use for Prometheus metrics, can be `http` or `https` | prometheus | `https` | +|`per_model_metrics`|Whether to include the `modelId` and `vModelId` labels in applicable published metrics|prometheus|`false` (*)| +(*) In versions of ModelMesh between Sep 5 2023 and Nov 16 2023, the default value of `per_model_metrics` was (unintentionally) `true`. ### Capturing Prometheus metrics @@ -61,4 +63,4 @@ prometheus.io/scrape: "true" | modelmesh_instance_capacity_bytes | Gauge | Pod | Effective model capacity of pod excluding unload buffer | | modelmesh_instance_used_bytes | Gauge | Pod | Amount of capacity currently in use by loaded models | | modelmesh_instance_used_bps | Gauge | Pod | Amount of capacity used in basis points (100ths of percent) | -| modelmesh_instance_models_total | Gauge | Pod | Number of model copies loaded in pod | \ No newline at end of file +| modelmesh_instance_models_total | Gauge | Pod | Number of model copies loaded in pod |