Skip to content

Commit

Permalink
Merge branch 'main' into bumpUbi8-c
Browse files Browse the repository at this point in the history
  • Loading branch information
@spolti
spolti authored Nov 21, 2023
2 parents fa18bdf + 68677c6 commit 0a79e93
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions docs/metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 |
| modelmesh_instance_models_total | Gauge | Pod | Number of model copies loaded in pod |
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<!-- Care must be taken when updating the prometheus client lib version
since we have some custom optimized extensions to this -->
<prometheus-version>0.9.0</prometheus-version>
<bouncycastle-version>1.70</bouncycastle-version>
<bouncycastle-version>1.74</bouncycastle-version>
<junit-version>5.10.0</junit-version>

<dockerhome>${project.build.directory}/dockerhome</dockerhome>
Expand Down Expand Up @@ -450,7 +450,7 @@
generate a self-signed server certificate -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle-version}</version>
</dependency>

Expand Down

0 comments on commit 0a79e93

Please sign in to comment.