From 2e9337ea3ff09051b886b6373edc35667beb3e8a Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Tue, 6 Jun 2023 23:52:27 +0300 Subject: [PATCH] chore(naming): Rename rust-peer to nox (#152) * Rename rust-peer to nox * Fix * Fix --- .github/workflows/container.yml | 25 +- .github/workflows/release.yml | 22 +- Dockerfile | 12 +- README.md | 27 +- deploy/README.md | 16 +- deploy/docker-compose/README.md | 28 +- deploy/docker-compose/configs/prometheus.yml | 2 +- deploy/docker-compose/configs/promtail.yml | 2 +- deploy/docker-compose/docker-compose.yml | 8 +- .../dashboards/{rust-peer.json => nox.json} | 2447 +++++++---------- .../grafana/dashboards/service-metrics.json | 259 +- docs/builtins.md | 2 +- docs/flavours.md | 16 +- 13 files changed, 1361 insertions(+), 1505 deletions(-) rename deploy/docker-compose/grafana/dashboards/{rust-peer.json => nox.json} (53%) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index b175f99..adafc48 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -6,7 +6,7 @@ on: image: description: "image name" type: string - default: "fluencelabs/rust-peer" + default: "fluencelabs/nox" version: description: "version set as part of container tag" type: string @@ -106,6 +106,23 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max + - name: Build and push ${{ matrix.package }} (legacy) + if: inputs.release + uses: docker/build-push-action@v3 + with: + context: . + push: true + target: ${{ matrix.package }} + tags: | + fluencelabs/rust-peer:${{ matrix.package }} + fluencelabs/rust-peer:${{ matrix.package }}_${{ env.RELEASE_VERSION }} + labels: | + org.opencontainers.image.version=${{ env.RELEASE_VERSION }} + org.opencontainers.image.created=${{ env.BUILD_DATE }} + org.opencontainers.image.revision=${{ github.sha }} + cache-from: type=gha + cache-to: type=gha,mode=max + - name: Build and push ${{ matrix.package }} if: ${{ matrix.package == 'ipfs' && inputs.release }} uses: docker/build-push-action@v3 @@ -116,6 +133,8 @@ jobs: tags: | ${{ inputs.image }}:latest ${{ inputs.image }}:${{ env.RELEASE_VERSION }} + fluencelabs/rust-peer:latest + fluencelabs/rust-peer:${{ env.RELEASE_VERSION }} labels: | org.opencontainers.image.version=${{ env.RELEASE_VERSION }} org.opencontainers.image.created=${{ env.BUILD_DATE }} @@ -129,13 +148,13 @@ jobs: with: username: ${{ env.DOCKER_USERNAME }} password: ${{ env.DOCKER_PASSWORD }} - repository: fluencelabs/rust-peer + repository: fluencelabs/nox - name: Print results to check summary if: always() run: | cat <<'SNAPSHOT' >> $GITHUB_STEP_SUMMARY - ## rust-peer ${{ matrix.package }} + ## nox ${{ matrix.package }} digest: `${{ steps.docker.outputs.digest }}` ``` ${{ inputs.image }}:${{ matrix.package }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e502bfa..d6a7bed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,24 +68,24 @@ jobs: ## Docker tags ### ipfs - Contains Fluence rust-peer and builtin IPFS deaemon. + Contains Fluence nox and builtin IPFS deaemon. - fluencelabs/rust-peer:latest - fluencelabs/rust-peer:${{ env.RELEASE_VERSION }} - fluencelabs/rust-peer:ipfs - fluencelabs/rust-peer:ipfs_${{ env.RELEASE_VERSION }} + fluencelabs/nox:latest + fluencelabs/nox:${{ env.RELEASE_VERSION }} + fluencelabs/nox:ipfs + fluencelabs/nox:ipfs_${{ env.RELEASE_VERSION }} ## minimal - Contains Fluence rust-peer only. + Contains Fluence nox only. - fluencelabs/rust-peer:minimal - fluencelabs/rust-peer:minimal_${{ env.RELEASE_VERSION }} + fluencelabs/nox:minimal + fluencelabs/nox:minimal_${{ env.RELEASE_VERSION }} ## rich - Contains Fluence rust-peer, IPFS, ceramic cli, bitcoin cli and geth cli. + Contains Fluence nox, IPFS, ceramic cli, bitcoin cli and geth cli. - fluencelabs/rust-peer:rich - fluencelabs/rust-peer:rich_${{ env.RELEASE_VERSION }} + fluencelabs/nox:rich + fluencelabs/nox:rich_${{ env.RELEASE_VERSION }} slack: if: always() diff --git a/Dockerfile b/Dockerfile index 3e949d5..43a0f38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,12 +29,12 @@ ARG BUILDPLATFORM # https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys LABEL org.opencontainers.image.base.name="ghcr.io/linuxserver/baseimage-ubuntu:jammy" -LABEL org.opencontainers.image.url="https://github.com/fluencelabs/rust-peer-distro" +LABEL org.opencontainers.image.url="https://github.com/fluencelabs/nox-distro" LABEL org.opencontainers.image.vendor="fluencelabs" LABEL maintainer="fluencelabs" LABEL org.opencontainers.image.authors="fluencelabs" -LABEL org.opencontainers.image.title="Fluence rust-peer distro" -LABEL org.opencontainers.image.description="Minimal image containing only rust-peer itself" +LABEL org.opencontainers.image.title="Fluence nox distro" +LABEL org.opencontainers.image.description="Minimal image containing only nox itself" ENV RUST_LOG="info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info" ENV RUST_BACKTRACE="1" @@ -69,7 +69,7 @@ ENV FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS=0xb497e025D3095A197E30Ca84DEc36a637E6 # find deals from this block ENV FLUENCE_ENV_CONNECTOR_FROM_BLOCK=0x75f3fbc -# download rust-peer binary, builtins +# download nox binary, builtins COPY fluence/ /fluence/ RUN /fluence/download_builtins.sh /fluence/services.json RUN /fluence/download_fluence.sh /fluence/fluence.json @@ -90,7 +90,7 @@ FROM minimal as ipfs ARG TARGETPLATFORM ARG BUILDPLATFORM -LABEL org.opencontainers.image.description="rust-peer bundled with IPFS daemon" +LABEL org.opencontainers.image.description="nox bundled with IPFS daemon" LABEL dev.fluence.bundles.ipfs="${IPFS_VERSION}" ENV IPFS_PATH=/config/ipfs @@ -127,7 +127,7 @@ ARG BITCOIN_CLI_VERSION ARG TARGETPLATFORM ARG BUILDPLATFORM -LABEL org.opencontainers.image.description="rust-peer bundled with IPFS, Ceramic CLI and other tools" +LABEL org.opencontainers.image.description="nox bundled with IPFS, Ceramic CLI and other tools" LABEL dev.fluence.image.bundles.ceramic="${CERAMIC_VERSION}" LABEL dev.fluence.image.bundles.glazed="${GLAZED_VERSION}" LABEL dev.fluence.image.bundles.bitcoin_cli="${BITCOIN_CLI_VERSION}" diff --git a/README.md b/README.md index 31e41aa..d31febe 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,27 @@ -# Rust Peer Distro +# Nox Distro -The distributive and packaging of the -[Rust peer](https://github.com/fluencelabs/rust-peer). +The distributive and packaging of the [nox](https://github.com/fluencelabs/nox). ## Installation and usage ```bash -docker run -d --name rust-peer -e RUST_LOG="info" -p 7777:7777 -p 9999:9999 fluencelabs/rust-peer:latest --local +docker run -d --name nox -e RUST_LOG="info" -p 7777:7777 -p 9999:9999 fluencelabs/nox:latest --local ``` -To get a list of commands that can be passed to rust-peer run: +To get a list of commands that can be passed to nox run: ```bash -docker run --rm --name rust-peer fluencelabs/rust-peer:latest --help +docker run --rm --name nox fluencelabs/nox:latest --help ``` See deployment instructions and tips at -[deploy](https://github.com/fluencelabs/rust-peer-distro/tree/master/deploy). +[deploy](https://github.com/fluencelabs/nox-distro/tree/master/deploy). ## Documentation - Rust peer distro - [image flavours](https://github.com/fluencelabs/rust-peer-distro/tree/master/docs/flavours.md) -- [Builtin services](https://github.com/fluencelabs/rust-peer-distro/tree/master/docs/builtins.md) + [image flavours](https://github.com/fluencelabs/nox-distro/tree/master/docs/flavours.md) +- [Builtin services](https://github.com/fluencelabs/nox-distro/tree/master/docs/builtins.md) Comprehensive documentation on everything related to Fluence can be found [here](https://fluence.dev/). Check also our @@ -30,8 +29,8 @@ Comprehensive documentation on everything related to Fluence can be found ## Support -Please, file an [issue](https://github.com/fluencelabs/rust-peer-distro/issues) -if you find a bug. You can also contact us at +Please, file an [issue](https://github.com/fluencelabs/nox-distro/issues) if you +find a bug. You can also contact us at [Discord](https://discord.com/invite/5qSnPZKh7u) or [Telegram](https://t.me/fluence_project). We will do our best to resolve the issue ASAP. @@ -40,12 +39,12 @@ issue ASAP. Any interested person is welcome to contribute to the project. Please, make sure you read and follow some basic -[rules](https://github.com/fluencelabs/rust-peer-distro/tree/master/CONTRIBUTING.md). +[rules](https://github.com/fluencelabs/nox-distro/tree/master/CONTRIBUTING.md). The Contributor License Agreement can be found -[here](https://github.com/fluencelabs/rust-peer-distro/tree/master/FluenceCLA). +[here](https://github.com/fluencelabs/nox-distro/tree/master/FluenceCLA). ## License All software code is copyright (c) Fluence Labs, Inc. under the -[Apache-2.0](https://github.com/fluencelabs/rust-peer-distro/tree/master/LICENSE) +[Apache-2.0](https://github.com/fluencelabs/nox-distro/tree/master/LICENSE) license. diff --git a/deploy/README.md b/deploy/README.md index 2adfc29..22fdcd9 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1,9 +1,13 @@ -# Running Rust Peer +# Running nox -Currently there is only one way to try out the Rust peer. It is by running it with [docker-compose](docker-compose/). An example configuration for popular orchestration platforms like [HasiCorp Nomad](https://www.nomadproject.io/) and K8S are coming soon! Meanwhile, you can adapt [this docker-compose file](docker-compose/docker-compose.yml) for the platform of your choice. +Currently there is only one way to try out the Rust peer. It is by running it +with [docker-compose](docker-compose/). An example configuration for popular +orchestration platforms like [HasiCorp Nomad](https://www.nomadproject.io/) and +K8S are coming soon! Meanwhile, you can adapt +[this docker-compose file](docker-compose/docker-compose.yml) for the platform +of your choice. +## Configuring nox distro image -## Configuring rust-peer distro image - -Checkout [this doc](../docs/flavours.md) to learn more about rust-peer image -flavours and environment variables used to configure the images. +Checkout [this doc](../docs/flavours.md) to learn more about nox image flavours +and environment variables used to configure the images. diff --git a/deploy/docker-compose/README.md b/deploy/docker-compose/README.md index 40ed47c..d306cb8 100644 --- a/deploy/docker-compose/README.md +++ b/deploy/docker-compose/README.md @@ -1,19 +1,19 @@ -# Run rust-peer with docker-compose +# Run nox with docker-compose This guide explains how to use docker-compose to start a local network of three -[rust-peer](https://github.com/fluencelabs/rust-peer) nodes. +[nox](https://github.com/fluencelabs/nox) nodes. ## Introduction -The rust-peer network is a set of peer nodes that can communicate with each +The nox network is a set of peer nodes that can communicate with each other to share data and execute code plus local IPFS node used by [aqua-ipfs builtin](../../docs/builtins.md##aqua-ipfs). By running a local -rust-peer network, you can test your applications in a controlled environment +nox network, you can test your applications in a controlled environment without relying on external networks. ## Prerequisites -Before you can run the rust-peer network, you need to have Docker and +Before you can run the nox network, you need to have Docker and docker-compose installed on your system. You can follow the official instructions for installing Docker and installing docker-compose on your operating system: @@ -21,7 +21,7 @@ operating system: - [docker](https://docs.docker.com/engine/install/) - [docker-compose](https://docs.docker.com/compose/install/linux/#install-using-the-repository) -## Starting local rust-peer network +## Starting local nox network 1. `git clone` this repository locally and run `cd deploy/docker-compose`. @@ -30,16 +30,16 @@ operating system: docker-compose pull ``` -3. Start the rust-peer network by running the following command: +3. Start the nox network by running the following command: ```bash docker-compose up -d ``` -This will start three rust-peer nodes, each listening on a different port. +This will start three nox nodes, each listening on a different port. -## Accessing local rust-peer network +## Accessing local nox network -To interact with the rust-peer network, you can use the +To interact with the nox network, you can use the [fluence-cli](https://github.com/fluencelabs/fluence-cli) tool. 1. Run `fluence init` and chose `minimal` project template. @@ -65,9 +65,9 @@ To interact with the rust-peer network, you can use the fluence run -f 'getInfo()' ``` -## Using local rust-peer network in your project +## Using local nox network in your project -You must make changes to `fluence.yaml` to use a local rust-peer network: +You must make changes to `fluence.yaml` to use a local nox network: - changing `hosts` key in `fluence.yaml` to: ```yml @@ -114,8 +114,8 @@ docker-compose -f docker-compose.yml -f docker-compose.observability.yml up -d Grafana will have automatically preprovisioned dashboards: -- rust-peer stats - overview of rust-peer network +- nox stats - overview of nox network - Service metrics - detailed stats on deployed services -You can find Grafana at http://localhost:3000. To access rust-peer logs use +You can find Grafana at http://localhost:3000. To access nox logs use `Explore` tab and chose `Loki` datasource. diff --git a/deploy/docker-compose/configs/prometheus.yml b/deploy/docker-compose/configs/prometheus.yml index ca4236d..913ce74 100644 --- a/deploy/docker-compose/configs/prometheus.yml +++ b/deploy/docker-compose/configs/prometheus.yml @@ -2,7 +2,7 @@ global: scrape_interval: "15s" scrape_configs: - - job_name: "rust-peer" + - job_name: "nox" scrape_interval: "15s" static_configs: - targets: diff --git a/deploy/docker-compose/configs/promtail.yml b/deploy/docker-compose/configs/promtail.yml index 7455930..a9473a2 100644 --- a/deploy/docker-compose/configs/promtail.yml +++ b/deploy/docker-compose/configs/promtail.yml @@ -5,7 +5,7 @@ clients: - url: "http://loki:3100/loki/api/v1/push" scrape_configs: - - job_name: "rust-peer" + - job_name: "nox" docker_sd_configs: - host: unix:///var/run/docker.sock filters: diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml index 84a40df..c1a4694 100644 --- a/deploy/docker-compose/docker-compose.yml +++ b/deploy/docker-compose/docker-compose.yml @@ -1,8 +1,8 @@ -name: rust-peer-network +name: nox-network services: peer-1: - image: fluencelabs/rust-peer:rich + image: fluencelabs/nox:rich container_name: "peer-1-12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR" ports: - 7771:7771 @@ -31,7 +31,7 @@ services: - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq peer-2: - image: fluencelabs/rust-peer:rich + image: fluencelabs/nox:rich container_name: "peer-2-12D3KooWQdpukY3p2DhDfUfDgphAqsGu5ZUrmQ4mcHSGrRag6gQK" ports: - 7772:7772 @@ -60,7 +60,7 @@ services: - -k=2WijTVdhVRzyZamWjqPx4V4iNMrajegNMwNa2PmvPSZV6RRpo5M2fsPWdQr22HVRubuJhhSw8BrWiGt6FPhFAuXy peer-3: - image: fluencelabs/rust-peer:rich + image: fluencelabs/nox:rich container_name: "peer-3-12D3KooWRT8V5awYdEZm6aAV9HWweCEbhWd7df4wehqHZXAB7yMZ" ports: - 7773:7773 diff --git a/deploy/docker-compose/grafana/dashboards/rust-peer.json b/deploy/docker-compose/grafana/dashboards/nox.json similarity index 53% rename from deploy/docker-compose/grafana/dashboards/rust-peer.json rename to deploy/docker-compose/grafana/dashboards/nox.json index db51823..1f5f7bb 100644 --- a/deploy/docker-compose/grafana/dashboards/rust-peer.json +++ b/deploy/docker-compose/grafana/dashboards/nox.json @@ -41,6 +41,111 @@ "title": "Status", "type": "row" }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 101, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "9.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "rust_peer_build_info{env=~\"$env\",instance=~\"$instance\"}", + "format": "table", + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "A" + } + ], + "title": "Nox versions", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "Value": true, + "__name__": true, + "hostname": true, + "job": true + }, + "indexByName": { + "Time": 5, + "Value": 9, + "__name__": 6, + "air_version": 3, + "env": 0, + "hostname": 7, + "instance": 1, + "job": 8, + "peer_version": 2, + "spell_version": 4 + }, + "renameByName": { + "air_version": "air version", + "peer_version": "nox version", + "spell_version": "spell version" + } + } + } + ], + "type": "table" + }, { "datasource": { "type": "prometheus", @@ -59,28 +164,37 @@ "mappings": [ { "options": { - "0": { + "from": 0, + "result": { + "index": 0, + "text": "U" + }, + "to": 0.05 + }, + "type": "range" + }, + { + "options": { + "from": 0.05, + "result": { "index": 1, "text": "D" }, - "1": { - "index": 0, - "text": "U" - } + "to": 1 }, - "type": "value" + "type": "range" } ], "thresholds": { "mode": "absolute", "steps": [ { - "color": "red", + "color": "green", "value": null }, { - "color": "green", - "value": 1 + "color": "red", + "value": 0.05 } ] } @@ -89,9 +203,9 @@ }, "gridPos": { "h": 11, - "w": 24, + "w": 12, "x": 0, - "y": 1 + "y": 8 }, "id": 4, "maxDataPoints": 15, @@ -121,7 +235,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "min_over_time(up{job=~\"fluence|rust-peer\",env=~\"$env\",instance=~\"$instance\"}[$__rate_interval])", + "expr": "avg_over_time((1 - up{job=~\"fluence|rust-peer|nox\",env=~\"$env\",instance=~\"$instance\"})[5m:])", "format": "time_series", "instant": false, "interval": "", @@ -134,197 +248,202 @@ "type": "status-history" }, { - "collapsed": true, + "collapsed": false, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 12 + "y": 19 }, "id": 98, - "panels": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red" - }, - { - "color": "#EAB839", - "value": 2 - }, - { - "color": "green", - "value": 7 - }, - { - "color": "blue", - "value": 20 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 13 - }, - "id": 45, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.3", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "connection_pool_connected_peers{env=~\"$env\"}", - "interval": "", - "legendFormat": "{{ instance }}", - "range": true, - "refId": "A" - } - ], - "title": "Active Connections", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": -1, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineStyle": { - "fill": "solid" - }, - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 13 - }, - "id": 10, - "options": { - "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "sortBy": "Last *", - "sortDesc": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "8.3.4", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum(connection_pool_connected_peers{env=\"$env\",instance=~\"$instance\"}) by (instance)", - "hide": false, - "interval": "", - "legendFormat": "{{ instance }}", - "range": true, - "refId": "A" - } - ], - "title": "Active Connections", - "type": "timeseries" - } - ], + "panels": [], "repeat": "env", "repeatDirection": "h", "title": "Connections $env", "type": "row" }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "fieldConfig": { + "defaults": { + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 20 + }, + "id": 45, + "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Reds", + "steps": 10 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } + }, + "pluginVersion": "9.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "connection_pool_connected_peers{env=~\"$env\",instance=~\"$instance\"}", + "interval": "", + "legendFormat": "{{ instance }}", + "range": true, + "refId": "A" + } + ], + "title": "Active Connections", + "type": "heatmap" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": -1, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 20 + }, + "id": 10, + "options": { + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Last *", + "sortDesc": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(connection_pool_connected_peers{env=\"$env\",instance=~\"$instance\"}) by (instance)", + "hide": false, + "interval": "", + "legendFormat": "{{ instance }}", + "range": true, + "refId": "A" + } + ], + "title": "Active Connections", + "type": "timeseries" + }, { "collapsed": true, "datasource": { @@ -335,7 +454,7 @@ "h": 1, "w": 24, "x": 0, - "y": 13 + "y": 28 }, "id": 24, "panels": [ @@ -365,12 +484,12 @@ }, "gridPos": { "h": 8, - "w": 5, + "w": 8, "x": 0, - "y": 22 + "y": 30 }, - "id": 14, - "maxDataPoints": 100, + "id": 84, + "maxPerRow": 3, "options": { "colorMode": "value", "graphMode": "area", @@ -385,7 +504,9 @@ }, "textMode": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", + "repeat": "timerange", + "repeatDirection": "h", "targets": [ { "datasource": { @@ -394,8 +515,8 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (increase(connectivity_particle_send_success_total{env=\"$env\"}[$__range]))", - "interval": "", + "expr": "sum (increase(connectivity_particle_send_success_total{env=\"$env\",instance=~\"$instance\"}[$timerange]))", + "interval": "1m", "legendFormat": "sent", "range": true, "refId": "A" @@ -407,443 +528,17 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (increase(connection_pool_received_particles_total{env=\"$env\"}[$__range]))", + "expr": "sum(increase(connection_pool_received_particles_total{env=\"$env\",instance=~\"$instance\"}[$timerange]))", "hide": false, - "interval": "", + "interval": "1m", "legendFormat": "received", "range": true, "refId": "C" } ], - "title": "Particles per current time range", + "title": "Particles per $timerange", "type": "stat" }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-BlPu" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 6, - "x": 5, - "y": 22 - }, - "id": 83, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.3", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connectivity_particle_send_success_total{env=\"$env\"}[1d]))", - "interval": "1m", - "legendFormat": "{{ env }} sent", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connection_pool_received_particles_total{env=\"$env\"}[1d]))", - "hide": false, - "interval": "1m", - "legendFormat": "{{ env }} received", - "range": true, - "refId": "C" - } - ], - "title": "Particles per day", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-BlPu" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 6, - "x": 11, - "y": 22 - }, - "id": 84, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.3", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connectivity_particle_send_success_total{env=\"$env\"}[7d]))", - "interval": "1m", - "legendFormat": "{{ env }} sent", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connection_pool_received_particles_total{env=\"$env\"}[7d]))", - "hide": false, - "interval": "1m", - "legendFormat": "{{ env }} received", - "range": true, - "refId": "C" - } - ], - "title": "Particles per week", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-BlPu" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 7, - "x": 17, - "y": 22 - }, - "id": 88, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.3", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connectivity_particle_send_success_total{env=\"$env\"}[30d]))", - "interval": "1m", - "legendFormat": "{{ env }} sent", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connection_pool_received_particles_total{env=\"$env\"}[30d]))", - "hide": false, - "interval": "1m", - "legendFormat": "{{ env }} received", - "range": true, - "refId": "C" - } - ], - "title": "Particles per month", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 1, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineStyle": { - "fill": "solid" - }, - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 30 - }, - "id": 82, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "9.0.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connectivity_particle_send_success_total{env=\"$env\"}[1d]) + ignoring(day_of_week) group_right count_values without() (\"day_of_week\", day_of_week(timestamp(increase(connectivity_particle_send_success_total{env=\"$env\"}[1d])))))", - "interval": "1m", - "legendFormat": "{{env}}", - "range": true, - "refId": "A" - } - ], - "title": "Particles per day (sent)", - "transformations": [], - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 1, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineStyle": { - "fill": "solid" - }, - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 30 - }, - "id": 87, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "9.0.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PAE45454D0EDB9216" - }, - "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (increase(connection_pool_received_particles_total{env=\"$env\"}[1d]) + ignoring(day_of_week) group_right count_values without() (\"day_of_week\", day_of_week(timestamp(increase(connection_pool_received_particles_total{env=\"$env\"}[1d])))))", - "interval": "1m", - "legendFormat": "{{env}}", - "range": true, - "refId": "A" - } - ], - "title": "Particles per day (received)", - "transformations": [], - "type": "timeseries" - }, { "datasource": { "type": "prometheus", @@ -904,7 +599,7 @@ }, "gridPos": { "h": 8, - "w": 10, + "w": 24, "x": 0, "y": 38 }, @@ -917,7 +612,7 @@ "showLegend": true }, "tooltip": { - "mode": "single", + "mode": "multi", "sort": "none" } }, @@ -930,7 +625,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (rate(connectivity_particle_send_success_total{env=\"$env\"}[$__rate_interval]))", + "expr": "-sum by (env) (rate(connectivity_particle_send_success_total{env=\"$env\"}[$__rate_interval]))", "interval": "1m", "legendFormat": "{{ env }} sent", "range": true, @@ -959,50 +654,65 @@ "type": "prometheus", "uid": "PAE45454D0EDB9216" }, + "description": "", "fieldConfig": { "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "mappings": [], - "max": 500, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } } }, "overrides": [] }, "gridPos": { - "h": 8, - "w": 4, - "x": 10, - "y": 38 + "h": 9, + "w": 12, + "x": 0, + "y": 46 }, - "id": 2, + "id": 82, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, - "orientation": "vertical", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Greens", + "steps": 10 }, - "showUnfilled": true + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", + "repeat": "particle_type", + "repeatDirection": "h", "targets": [ { "datasource": { @@ -1010,16 +720,16 @@ "uid": "PAE45454D0EDB9216" }, "editorMode": "code", - "exemplar": false, - "expr": "sum by (env) (connectivity_particle_send_failure_total{env=\"$env\"}) ", - "instant": false, - "interval": "", - "legendFormat": "{{env}}", - "refId": "A" + "expr": "increase(connectivity_particle_send_success_total{env=\"$env\",instance=~\"$instance\",particle_type=\"$particle_type\"}[$__rate_interval])", + "hide": false, + "legendFormat": "{{instance}}", + "range": true, + "refId": "B" } ], - "title": "Particle Send Failures", - "type": "bargauge" + "title": "Particles sent success ($particle_type)", + "transformations": [], + "type": "heatmap" }, { "datasource": { @@ -1028,76 +738,62 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 25, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "normal" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" + } }, "overrides": [] }, "gridPos": { "h": 8, - "w": 10, - "x": 14, - "y": 38 + "w": 12, + "x": 0, + "y": 55 }, "id": 44, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", + "repeat": "particle_type", + "repeatDirection": "h", "targets": [ { "datasource": { @@ -1106,15 +802,15 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (connectivity_particle_send_failure_total{env=\"$env\"})", + "expr": "increase(connectivity_particle_send_failure_total{env=\"$env\",instance=~\"$instance\",particle_type=\"$particle_type\"}[$__rate_interval])", "instant": false, "interval": "", - "legendFormat": "{{env}}", + "legendFormat": "{{instance}}", "refId": "A" } ], - "title": "Particle Send Failures", - "type": "timeseries" + "title": "Particle Send Failures ($particle_type)", + "type": "heatmap" }, { "cards": {}, @@ -1147,9 +843,9 @@ }, "gridPos": { "h": 10, - "w": 24, + "w": 12, "x": 0, - "y": 46 + "y": 63 }, "heatmap": {}, "hideZeroBuckets": false, @@ -1159,6 +855,7 @@ "show": true }, "maxDataPoints": 100, + "maxPerRow": 2, "options": { "calculate": false, "calculation": {}, @@ -1196,7 +893,9 @@ "unit": "bytes" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", + "repeat": "particle_type", + "repeatDirection": "h", "reverseYBuckets": false, "targets": [ { @@ -1206,7 +905,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(rate(connection_pool_particle_sizes_bucket{env=~\"$env\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(connection_pool_particle_sizes_bucket{env=~\"$env\",particle_type=\"$particle_type\"}[$__rate_interval])) by (le)", "format": "time_series", "interval": "1m", "legendFormat": "__auto", @@ -1214,7 +913,7 @@ "refId": "A" } ], - "title": "Incoming Particle Sizes", + "title": "Incoming Particle Sizes ($particle_type)", "tooltip": { "show": true, "showHistogram": false @@ -1237,53 +936,61 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "mappings": [], - "max": 300, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "#EAB839", - "value": 50 - }, - { - "color": "red", - "value": 200 - } - ] + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } } }, "overrides": [] }, "gridPos": { "h": 8, - "w": 6, + "w": 8, "x": 0, - "y": 56 + "y": 73 }, "id": 20, "maxDataPoints": 100, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 }, - "showUnfilled": true + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1300,7 +1007,7 @@ } ], "title": "Alive Actors", - "type": "bargauge" + "type": "heatmap" }, { "datasource": { @@ -1309,48 +1016,60 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "mappings": [], - "max": 200, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } } }, "overrides": [] }, "gridPos": { "h": 8, - "w": 6, - "x": 6, - "y": 56 + "w": 8, + "x": 8, + "y": 73 }, "id": 8, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 }, - "showUnfilled": true + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1367,7 +1086,7 @@ } ], "title": "Connection Pool Queue Size", - "type": "bargauge" + "type": "heatmap" }, { "datasource": { @@ -1376,48 +1095,60 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "mappings": [], - "max": 300, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } } }, "overrides": [] }, "gridPos": { "h": 8, - "w": 6, - "x": 12, - "y": 56 + "w": 8, + "x": 16, + "y": 73 }, "id": 16, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 }, - "showUnfilled": true + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1434,7 +1165,7 @@ } ], "title": "Actor mailbox size", - "type": "bargauge" + "type": "heatmap" } ], "repeat": "env", @@ -1461,7 +1192,7 @@ "h": 1, "w": 24, "x": 0, - "y": 14 + "y": 29 }, "id": 53, "panels": [ @@ -1498,7 +1229,7 @@ "h": 10, "w": 24, "x": 0, - "y": 65 + "y": 82 }, "heatmap": {}, "hideZeroBuckets": false, @@ -1545,7 +1276,7 @@ "unit": "dtdurations" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "reverseYBuckets": false, "targets": [ { @@ -1557,6 +1288,7 @@ "exemplar": false, "expr": "sum(increase(particle_executor_interpretation_time_sec_bucket{env=~\"$env\"}[$__rate_interval])) by (le)", "format": "heatmap", + "hide": false, "interval": "1m", "legendFormat": "{{ le }}", "range": true, @@ -1612,7 +1344,7 @@ "h": 10, "w": 24, "x": 0, - "y": 75 + "y": 92 }, "heatmap": {}, "hideZeroBuckets": false, @@ -1659,7 +1391,7 @@ "unit": "dtdurations" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "reverseYBuckets": false, "targets": [ { @@ -1702,7 +1434,8 @@ "fieldConfig": { "defaults": { "color": { - "mode": "continuous-YlBl" + "fixedColor": "text", + "mode": "fixed" }, "decimals": 0, "mappings": [], @@ -1714,21 +1447,22 @@ "color": "green" } ] - } + }, + "unit": "short" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, + "w": 5, "x": 0, - "y": 85 + "y": 102 }, "id": 65, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1737,9 +1471,9 @@ "fields": "", "values": false }, - "showUnfilled": true + "textMode": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1748,15 +1482,29 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (particle_executor_service_call_success_total{env=\"$env\"})", + "expr": "sum by (env) (particle_executor_service_call_success_total{env=\"$env\", instance=~\"$instance\"})", "interval": "", - "legendFormat": "{{ env }}", + "legendFormat": "success", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum by (env) (particle_executor_service_call_failure_total{env=\"$env\", instance=~\"$instance\"})", + "hide": false, + "interval": "", + "legendFormat": "failure", + "range": true, + "refId": "B" } ], "title": "Service Calls", - "type": "bargauge" + "type": "stat" }, { "datasource": { @@ -1766,76 +1514,61 @@ "description": "", "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 25, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "normal" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, - "x": 8, - "y": 85 + "w": 11, + "x": 5, + "y": 102 }, "id": 67, "maxDataPoints": 200, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 10 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1844,15 +1577,15 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (rate(particle_executor_service_call_time_sec_count{env=\"$env\"}[$__rate_interval]))", + "expr": "sum by (instance) (rate(particle_executor_service_call_time_sec_count{env=\"$env\",instance=~\"$instance\"}[$__rate_interval]))", "interval": "1m", - "legendFormat": "__auto", + "legendFormat": "{{instance}}", "range": true, "refId": "A" } ], "title": "Service Calls per second", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -1861,51 +1594,15 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 25, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "normal" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] @@ -1914,22 +1611,43 @@ "h": 8, "w": 8, "x": 16, - "y": 85 + "y": 102 }, "id": 71, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1938,15 +1656,15 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (particle_executor_service_call_failure_total{env=~\"$env\"}) ", + "expr": "increase(particle_executor_service_call_failure_total{env=~\"$env\",instance=~\"$instance\"}[$__rate_interval])", "instant": false, "interval": "", - "legendFormat": "{{env}}", + "legendFormat": "{{ instance }}", "refId": "A" } ], "title": "Service Call Failures", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -1957,7 +1675,8 @@ "fieldConfig": { "defaults": { "color": { - "mode": "continuous-YlBl" + "fixedColor": "text", + "mode": "fixed" }, "decimals": 0, "mappings": [], @@ -1969,21 +1688,22 @@ "color": "green" } ] - } + }, + "unit": "short" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, + "w": 5, "x": 0, - "y": 93 + "y": 110 }, - "id": 72, + "id": 100, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", "reduceOptions": { "calcs": [ @@ -1992,9 +1712,9 @@ "fields": "", "values": false }, - "showUnfilled": true + "textMode": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2003,15 +1723,29 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (particle_executor_interpretation_successes_total{env=~\"$env\"})", + "expr": "sum by (env) (particle_executor_interpretation_successes_total{env=\"$env\", instance=~\"$instance\"})", "interval": "", - "legendFormat": "{{ env }}", + "legendFormat": "success", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum by (env) (particle_executor_interpretation_failures_total{env=\"$env\", instance=~\"$instance\"})", + "hide": false, + "interval": "", + "legendFormat": "failure", + "range": true, + "refId": "B" } ], - "title": "Interpretations", - "type": "bargauge" + "title": "Interpolation", + "type": "stat" }, { "datasource": { @@ -2021,75 +1755,60 @@ "description": "", "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 25, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "normal" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, - "x": 8, - "y": 93 + "w": 11, + "x": 5, + "y": 110 }, "id": 73, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 10 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2098,15 +1817,15 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (rate(particle_executor_interpretation_time_sec_count{env=~\"$env\"}[$__rate_interval]))", + "expr": "sum by (instance) (rate(particle_executor_interpretation_time_sec_count{env=~\"$env\",instance=~\"$instance\"}[$__rate_interval]))", "interval": "1m", - "legendFormat": "{{ env }}", + "legendFormat": "{{ instance }}", "range": true, "refId": "A" } ], "title": "Interpretations per second", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2115,51 +1834,15 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 25, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "normal" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] @@ -2168,22 +1851,43 @@ "h": 8, "w": 8, "x": 16, - "y": 93 + "y": 110 }, "id": 74, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2192,15 +1896,15 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by (env) (particle_executor_interpretation_failures_total{env=~\"$env\"}) ", + "expr": "increase(particle_executor_interpretation_failures_total{env=~\"$env\",instance=~\"$instance\"}[$__rate_interval])", "instant": false, "interval": "", - "legendFormat": "{{env}}", + "legendFormat": "{{ instance }}", "refId": "A" } ], "title": "Interpretation Failures", - "type": "timeseries" + "type": "heatmap" } ], "targets": [ @@ -2225,7 +1929,7 @@ "h": 1, "w": 24, "x": 0, - "y": 15 + "y": 30 }, "id": 41, "panels": [ @@ -2236,53 +1940,16 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -2290,26 +1957,46 @@ "h": 8, "w": 12, "x": 0, - "y": 102 + "y": 119 }, "id": 49, "options": { + "calculate": false, + "cellGap": 1, + "cellValues": { + "unit": "bytes" + }, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Blues", + "steps": 10 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "sortBy": "Last *", - "sortDesc": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2326,7 +2013,7 @@ } ], "title": "Single AquaVM memory max", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2335,53 +2022,16 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" + } }, "overrides": [] }, @@ -2389,26 +2039,46 @@ "h": 8, "w": 12, "x": 12, - "y": 102 + "y": 119 }, "id": 47, "options": { + "calculate": false, + "cellGap": 1, + "cellValues": { + "unit": "bytes" + }, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Blues", + "steps": 10 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "sortBy": "Last *", - "sortDesc": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2425,7 +2095,7 @@ } ], "title": "AquaVM total memory", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2434,51 +2104,15 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] @@ -2487,21 +2121,43 @@ "h": 8, "w": 6, "x": 0, - "y": 110 + "y": 127 }, "id": 38, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "multi", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2518,7 +2174,7 @@ } ], "title": "AquaVM Pool Starvation", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2528,49 +2184,16 @@ "description": "", "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "vm" + } }, "overrides": [] }, @@ -2578,26 +2201,43 @@ "h": 8, "w": 9, "x": 6, - "y": 110 + "y": 127 }, "id": 36, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "sortBy": "Last *", - "sortDesc": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "multi", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2614,7 +2254,7 @@ } ], "title": "Busy AquaVMs", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2623,50 +2263,16 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "max": 16, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - } - ] - }, - "unit": "vms" + } }, "overrides": [] }, @@ -2674,26 +2280,43 @@ "h": 8, "w": 9, "x": 15, - "y": 110 + "y": 127 }, "id": 32, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true, - "sortBy": "Last *", - "sortDesc": true + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "multi", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, - "pluginVersion": "8.3.4", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2710,7 +2333,7 @@ } ], "title": "Busy AquaVMs (misbehaves ???)", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2719,51 +2342,15 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "bars", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 3, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] @@ -2772,21 +2359,43 @@ "h": 8, "w": 6, "x": 0, - "y": 118 + "y": 135 }, "id": 78, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": false + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2804,7 +2413,7 @@ } ], "title": "put_vm per second", - "type": "timeseries" + "type": "heatmap" }, { "datasource": { @@ -2813,51 +2422,15 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "bars", - "fillOpacity": 0, - "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 3, "scaleDistribution": { "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] } }, "overrides": [] @@ -2866,21 +2439,43 @@ "h": 8, "w": 6, "x": 6, - "y": 118 + "y": 135 }, "id": 79, "options": { + "calculate": false, + "cellGap": 1, + "color": { + "exponent": 0.5, + "fill": "dark-orange", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Oranges", + "steps": 64 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": false + "show": true + }, + "rowsFrame": { + "layout": "auto" }, "tooltip": { - "mode": "single", - "sort": "none" + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false } }, + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -2898,7 +2493,7 @@ } ], "title": "get_vm per second", - "type": "timeseries" + "type": "heatmap" } ], "repeat": "env", @@ -2916,18 +2511,18 @@ "type": "row" } ], - "refresh": "", + "refresh": "30s", "revision": 1, "schemaVersion": 38, "style": "dark", "tags": [ - "rust-peer" + "nox" ], "templating": { "list": [ { "current": { - "selected": true, + "selected": false, "text": [ "krasnodar" ], @@ -2939,7 +2534,7 @@ "type": "prometheus", "uid": "PAE45454D0EDB9216" }, - "definition": "label_values(up{job=~\"fluence|rust-peer\"}, env)", + "definition": "label_values(up{job=~\"fluence|rust-peer|nox\"}, env)", "hide": 0, "includeAll": true, "label": "env", @@ -2947,7 +2542,7 @@ "name": "env", "options": [], "query": { - "query": "label_values(up{job=~\"fluence|rust-peer\"}, env)", + "query": "label_values(up{job=~\"fluence|rust-peer|nox\"}, env)", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -2958,7 +2553,7 @@ }, { "current": { - "selected": true, + "selected": false, "text": [ "All" ], @@ -2970,7 +2565,7 @@ "type": "prometheus", "uid": "PAE45454D0EDB9216" }, - "definition": "label_values(up{job=~\"fluence|rust-peer\", env=~\"$env\"}, instance)", + "definition": "label_values(up{job=~\"fluence|rust-peer|nox\", env=~\"$env\"}, instance)", "hide": 0, "includeAll": true, "label": "instance", @@ -2978,7 +2573,7 @@ "name": "instance", "options": [], "query": { - "query": "label_values(up{job=~\"fluence|rust-peer\", env=~\"$env\"}, instance)", + "query": "label_values(up{job=~\"fluence|rust-peer|nox\", env=~\"$env\"}, instance)", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -2986,17 +2581,81 @@ "skipUrlSync": false, "sort": 0, "type": "query" + }, + { + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "definition": "label_values(connection_pool_particle_sizes_bucket{env=\"$env\"}, particle_type)", + "description": "", + "hide": 0, + "includeAll": true, + "multi": false, + "name": "particle_type", + "options": [], + "query": { + "query": "label_values(connection_pool_particle_sizes_bucket{env=\"$env\"}, particle_type)", + "refId": "StandardVariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + }, + { + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "hide": 0, + "includeAll": true, + "multi": false, + "name": "timerange", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "1d", + "value": "1d" + }, + { + "selected": false, + "text": "7d", + "value": "7d" + }, + { + "selected": false, + "text": "30d", + "value": "30d" + } + ], + "query": "1d,7d,30d", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" } ] }, "time": { - "from": "now-6h", + "from": "now-3h", "to": "now" }, "timepicker": {}, "timezone": "", - "title": "rust-peer stats", + "title": "nox stats", "uid": "AP0DB2bnz", - "version": 12, + "version": 39, "weekStart": "" -} \ No newline at end of file +} diff --git a/deploy/docker-compose/grafana/dashboards/service-metrics.json b/deploy/docker-compose/grafana/dashboards/service-metrics.json index 0461397..1489c8b 100644 --- a/deploy/docker-compose/grafana/dashboards/service-metrics.json +++ b/deploy/docker-compose/grafana/dashboards/service-metrics.json @@ -186,7 +186,7 @@ "le": 1e-9 }, "legend": { - "show": false + "show": true }, "rowsFrame": { "layout": "auto", @@ -201,7 +201,7 @@ "reverse": false } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -210,7 +210,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "services_services_count{env=~\"$env\",instance=~\"$instance\"}", + "expr": "sum by (instance,env) (services_services_count{env=~\"$env\",instance=~\"$instance\"})", "format": "time_series", "instant": false, "interval": "", @@ -221,13 +221,185 @@ "title": "Number of services by host", "type": "heatmap" }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "fieldConfig": { + "defaults": { + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 8 + }, + "id": 379, + "maxDataPoints": 100, + "options": { + "calculate": false, + "cellGap": 1, + "cellValues": { + "unit": "short" + }, + "color": { + "exponent": 0.5, + "fill": "light-purple", + "min": 0, + "mode": "opacity", + "reverse": false, + "scale": "exponential", + "scheme": "RdBu", + "steps": 52 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto", + "value": "Worker-spells" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } + }, + "pluginVersion": "9.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum by (instance,env) (services_services_count{env=~\"$env\",instance=~\"$instance\", service_type=\"worker-spell\"})", + "format": "time_series", + "instant": false, + "interval": "", + "legendFormat": "{{ instance }}", + "refId": "A" + } + ], + "title": "Number of worker-spells by host", + "type": "heatmap" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "fieldConfig": { + "defaults": { + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 8 + }, + "id": 380, + "maxDataPoints": 100, + "options": { + "calculate": false, + "cellGap": 1, + "cellValues": { + "unit": "short" + }, + "color": { + "exponent": 0.5, + "fill": "super-light-green", + "min": 0, + "mode": "opacity", + "reverse": false, + "scale": "exponential", + "scheme": "RdBu", + "steps": 47 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto", + "value": "Spells" + }, + "tooltip": { + "show": true, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false + } + }, + "pluginVersion": "9.5.2", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PAE45454D0EDB9216" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum by (instance,env) (services_services_count{env=~\"$env\",instance=~\"$instance\", service_type=\"spell\"})", + "format": "time_series", + "instant": false, + "interval": "", + "legendFormat": "{{ instance }}", + "refId": "A" + } + ], + "title": "Number of other spells by host", + "type": "heatmap" + }, { "collapsed": true, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 8 + "y": 16 }, "id": 140, "panels": [ @@ -255,7 +427,7 @@ "h": 11, "w": 24, "x": 0, - "y": 9 + "y": 17 }, "id": 23, "options": { @@ -296,7 +468,7 @@ "reverse": true } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -378,7 +550,7 @@ "h": 11, "w": 24, "x": 0, - "y": 20 + "y": 28 }, "id": 108, "options": { @@ -441,10 +613,10 @@ "overrides": [] }, "gridPos": { - "h": 10, + "h": 5, "w": 12, "x": 0, - "y": 31 + "y": 39 }, "id": 38, "options": { @@ -459,9 +631,10 @@ "fields": "", "values": false }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -528,10 +701,10 @@ "overrides": [] }, "gridPos": { - "h": 10, + "h": 5, "w": 12, "x": 12, - "y": 31 + "y": 39 }, "id": 318, "options": { @@ -546,9 +719,10 @@ "fields": "", "values": false }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -564,7 +738,7 @@ "refId": "A" } ], - "title": "Available memory per modules, total", + "title": "Available memory per services, total", "transformations": [ { "id": "organize", @@ -600,7 +774,7 @@ "h": 1, "w": 24, "x": 0, - "y": 9 + "y": 17 }, "id": 268, "panels": [ @@ -681,7 +855,7 @@ "h": 8, "w": 12, "x": 0, - "y": 42 + "y": 45 }, "id": 64, "options": { @@ -827,7 +1001,7 @@ "h": 8, "w": 12, "x": 12, - "y": 42 + "y": 45 }, "id": 41, "options": { @@ -922,7 +1096,7 @@ "h": 8, "w": 12, "x": 0, - "y": 50 + "y": 53 }, "heatmap": {}, "hideZeroBuckets": true, @@ -971,7 +1145,7 @@ "unit": "dtdurations" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "reverseYBuckets": false, "targets": [ { @@ -1040,7 +1214,7 @@ "h": 8, "w": 12, "x": 12, - "y": 50 + "y": 53 }, "heatmap": {}, "hideZeroBuckets": true, @@ -1089,7 +1263,7 @@ "unit": "dtdurations" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "reverseYBuckets": false, "targets": [ { @@ -1133,7 +1307,7 @@ "h": 1, "w": 24, "x": 0, - "y": 10 + "y": 18 }, "id": 124, "panels": [ @@ -1180,7 +1354,7 @@ "h": 9, "w": 4, "x": 0, - "y": 43 + "y": 62 }, "id": 45, "options": { @@ -1314,7 +1488,7 @@ "h": 9, "w": 10, "x": 4, - "y": 43 + "y": 62 }, "id": 92, "options": { @@ -1412,7 +1586,7 @@ "h": 9, "w": 10, "x": 14, - "y": 43 + "y": 62 }, "id": 43, "options": { @@ -1427,9 +1601,10 @@ "fields": "", "values": false }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1482,7 +1657,7 @@ "h": 10, "w": 24, "x": 0, - "y": 52 + "y": 71 }, "id": 49, "options": { @@ -1523,7 +1698,7 @@ "unit": "dtdurations" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1569,7 +1744,7 @@ "h": 8, "w": 11, "x": 0, - "y": 62 + "y": 81 }, "id": 19, "options": { @@ -1609,7 +1784,7 @@ "reverse": false } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -1662,7 +1837,7 @@ "h": 8, "w": 13, "x": 11, - "y": 62 + "y": 81 }, "heatmap": {}, "hideZeroBuckets": true, @@ -1713,7 +1888,7 @@ "unit": "bytes" } }, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "reverseYBuckets": false, "targets": [ { @@ -1759,7 +1934,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "rust-peer" + "nox" ], "templating": { "list": [ @@ -1777,7 +1952,7 @@ "type": "prometheus", "uid": "PAE45454D0EDB9216" }, - "definition": "label_values(up{job=~\"fluence|rust-peer\"}, env)", + "definition": "label_values(up{job=~\"fluence|rust-peer|nox\"}, env)", "hide": 0, "includeAll": false, "label": "env", @@ -1785,7 +1960,7 @@ "name": "env", "options": [], "query": { - "query": "label_values(up{job=~\"fluence|rust-peer\"}, env)", + "query": "label_values(up{job=~\"fluence|rust-peer|nox\"}, env)", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -1804,7 +1979,7 @@ "type": "prometheus", "uid": "PAE45454D0EDB9216" }, - "definition": "label_values(up{job=~\"fluence|rust-peer\",env=~\"$env\"}, instance)", + "definition": "label_values(up{job=~\"fluence|rust-peer|nox\",env=~\"$env\"}, instance)", "hide": 0, "includeAll": true, "label": "", @@ -1812,7 +1987,7 @@ "name": "instance", "options": [], "query": { - "query": "label_values(up{job=~\"fluence|rust-peer\",env=~\"$env\"}, instance)", + "query": "label_values(up{job=~\"fluence|rust-peer|nox\",env=~\"$env\"}, instance)", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -1858,6 +2033,6 @@ "timezone": "", "title": "Service metrics", "uid": "bKk0Bdl7Z", - "version": 33, + "version": 38, "weekStart": "" -} \ No newline at end of file +} diff --git a/docs/builtins.md b/docs/builtins.md index 32e7596..60ec6f0 100644 --- a/docs/builtins.md +++ b/docs/builtins.md @@ -1,6 +1,6 @@ # Builtin services -Rust peer distro comes with preconfigured builtin services. +Nox distro comes with preconfigured builtin services. ## [registry](https://github.com/fluencelabs/registry) diff --git a/docs/flavours.md b/docs/flavours.md index 46c1bb2..3de754b 100644 --- a/docs/flavours.md +++ b/docs/flavours.md @@ -1,8 +1,8 @@ -# Rust Peer Distro Flavours +# Nox Distro Flavours Each flavour is represented by a docker image tag. See the -[docker hub](https://hub.docker.com/r/fluencelabs/rust-peer) and the -[releases](https://github.com/fluencelabs/rust-peer-distro/releases) page. +[docker hub](https://hub.docker.com/r/fluencelabs/nox) and the +[releases](https://github.com/fluencelabs/nox-distro/releases) page. Each flavour builds upon its previous flavour. In particular, `ipfs` has everything that `minimal` has, and `rich` has everything that `minimal` and @@ -18,9 +18,9 @@ Tag `latest` points to the latest version of `ipfs` flavour. ## minimal -It contains Rust peer itself and some [builtin services](builtins.md). It serves -as a base image for all other image flavours and is intended for those who want -to run an IPFS node separately. +It contains nox itself and some [builtin services](builtins.md). It serves as a +base image for all other image flavours and is intended for those who want to +run an IPFS node separately. `FLUENCE_ENV_AQUA_IPFS_*` variables must be defined and point to externally running IPFS daemon in order for `aqua-ipfs` to work. If not defined, @@ -33,7 +33,7 @@ running IPFS daemon in order for `aqua-ipfs` to work. If not defined, ## ipfs -This is a Rust peer packaged with an +This is a nox packaged with an [IPFS node](https://docs.ipfs.io/how-to/command-line-quick-start/#take-your-node-online) running inside a container. @@ -51,7 +51,7 @@ running inside a container. ## rich -This is a Rust peer packaged with an IPFS node, +This is a nox packaged with an IPFS node, [Ceramic](https://developers.ceramic.network/learn/welcome/) CLI and some other binaries like bitcoin-cli or [geth](https://geth.ethereum.org/docs/interface/command-line-options).