From 9beaf092bfb4d6ace118241765ac8c7a12e01d32 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 13 May 2024 15:01:03 +0800 Subject: [PATCH] feat: add arm64 action Signed-off-by: Qi Zhang --- .github/workflows/standard-V5-arm64.yml | 143 +++++++++ grafana-dashboards/application/pod.json | 10 +- .../cluster/cluster-overview.json | 8 +- grafana-dashboards/rainbond/component.json | 299 ++++++------------ 4 files changed, 251 insertions(+), 209 deletions(-) create mode 100644 .github/workflows/standard-V5-arm64.yml diff --git a/.github/workflows/standard-V5-arm64.yml b/.github/workflows/standard-V5-arm64.yml new file mode 100644 index 0000000..ffdf0e0 --- /dev/null +++ b/.github/workflows/standard-V5-arm64.yml @@ -0,0 +1,143 @@ +name: standard-V5-Arm64 +on: + workflow_dispatch: + inputs: + branch: + description: 'branch' + required: true + default: 'enterprise-2306' + version: + description: 'version' + default: 'enterprise-2306-arm64' + required: true + runner_token: + description: 'runner_token' + required: true + +env: + VERSION: ${{ github.event.inputs.version }} + DOMESTIC_DOCKER_USERNAME: zhangq@goodrain + DOMESTIC_DOCKER_PASSWORD: ${{ secrets.DOMESTIC_DOCKER_PASSWORD }} + DOMESTIC_BASE_NAME: registry.ap-southeast-1.aliyuncs.com + DOMESTIC_NAMESPACE: goodrain-ee + BUILD_ARCH: arm64 + ECS: ecs.c6r.xlarge + +jobs: + create-ecs: + strategy: + matrix: + server: [ runner1, runner2,runner3, runner4,runner5, runner6 ] + runs-on: self-hosted + steps: + - name: Download and extract aliyun-cli + run: | + wget https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz + sudo tar -zxvf aliyun-cli-linux-latest-amd64.tgz -C /usr/bin/ + aliyun configure set --profile akProfile --mode AK --region ap-southeast-1 --access-key-id ${{ secrets.ZQ_ALI_AKI }} --access-key-secret ${{ secrets.ZQ_ALI_AKS }} + instanceIds=($(aliyun ecs DescribeInstanceStatus --region ap-southeast-1 --PageSize 50 --RegionId 'ap-southeast-1' | jq -r '.InstanceStatuses.InstanceStatus | map(.InstanceId)[]')) + if [ ${#instanceIds[@]} -gt 5 ]; then + echo "已经有${#instanceIds[@]}台服务器，不再进行创建" + exit 0 + fi + + create=$(aliyun ecs RunInstances --region ap-southeast-1 --RegionId 'ap-southeast-1' --ImageId 'ubuntu_22_04_arm64_20G_alibase_20230712.vhd' --InstanceType '${{ vars.ECS }}' --SecurityGroupId 'sg-t4n8sj6bpvaxfe3s47po' --VSwitchId 'vsw-t4nsosaaw6fw28vpjd2n7' --SystemDisk.Category cloud_essd --Description '打包arm64发布' --InstanceChargeType PostPaid --CreditSpecification Unlimited --InternetChargeType PayByTraffic --PasswordInherit false --Password '${{ secrets.ECS_PWD }}' --UniqueSuffix true --InternetMaxBandwidthOut 100 --InternetMaxBandwidthIn 100 --SystemDisk.Size 50 --SpotStrategy SpotAsPriceGo --SpotDuration 1) + instanceId=$(echo "$create" | jq -r '.InstanceIdSets.InstanceIdSet[0]') + echo "创建服务器成功，实例ID为 $instanceId，等待5秒后开始查询公网IP" + sleep 5 + # 查询服务器信息 + info=$(aliyun ecs DescribeInstanceAttribute --region ap-southeast-1 --InstanceId "$instanceId") + publishIp=$(echo "$info" | jq -r '.PublicIpAddress.IpAddress[0]') + echo "查询公网IP为 $publishIp，等待60s后执行github runner" + echo "PUBLISH_IP=$publishIp" >> $GITHUB_ENV + sleep 60 + - name: SSH To Server And Run Github Action Script + if: contains(env.PUBLISH_IP, '.') + uses: appleboy/ssh-action@master + with: + host: ${{ env.PUBLISH_IP }} + username: root + password: ${{ secrets.ECS_PWD }} + port: 22 + script: | + export GH_TOKEN="${{ github.event.inputs.runner_token }}" && curl https://rainbond-script.oss-cn-hangzhou.aliyuncs.com/runner.sh | bash + + build-allinone: + needs: create-ecs + runs-on: self-hosted + steps: + - name: Build the Docker image + env: + BUILD_RBD_APP_UI: false + ALLINONE: true + ROUTE_MODE: history + run: | + git clone -b ${{ github.event.inputs.branch }} --depth=1 https://pull-code:gr123465!!@git.goodrain.com/goodrain/rainbond-ui-cloud.git && cd rainbond-ui-cloud + chmod +x ./build.sh && ./build.sh + docker build -t rainbond/rainbond-ui:$VERSION . + + - name: Pull code and Build allinone image + env: + TRAVIS_PULL_REQUEST: false + ADAPTOR_BRANCH: enterprise-2023 + run: | + git clone -b ${{ github.event.inputs.branch }} --depth=1 https://pull-code:gr123465!!@git.goodrain.com/goodrain/rainbond-console-cloud.git && cd rainbond-console-cloud + chmod +x ./release.sh + ./release.sh allinone + + build-rainbond-region: + needs: create-ecs + runs-on: self-hosted + strategy: + matrix: + component: [api, chaos, gateway, monitor, mq, webcli, worker, eventlog, init-probe, mesh-data-panel, node, resource-proxy] + steps: + - name: Pull code and Build the Docker image + env: + DISABLE_GOPROXY: true + run: | + git clone -b ${{ github.event.inputs.branch }} --depth=1 https://pull-code:gr123465!!@git.goodrain.com/goodrain/rainbond.git && cd rainbond + chmod +x ./release.sh + ./release.sh ${{ matrix.component }} push + + build-rainbond-region-grctl-shell: + needs: create-ecs + runs-on: self-hosted + steps: + - name: Pull code and Build the Docker image + env: + DISABLE_GOPROXY: true + run: | + git clone -b ${{ github.event.inputs.branch }} --depth=1 https://pull-code:gr123465!!@git.goodrain.com/goodrain/rainbond.git && cd rainbond + chmod +x ./release.sh + ./release.sh grctl push + ./release.sh shell push + + build-operator: + needs: create-ecs + runs-on: self-hosted + steps: + - name: Build and push + run: | + git clone -b main --depth=1 https://github.com/goodrain/rainbond-operator.git && cd rainbond-operator + chmod +x ./release.sh + ./release.sh + + close-ecs: + needs: + - build-allinone + - build-rainbond-region + - build-rainbond-region-grctl-shell + - build-operator + runs-on: 'ubuntu-22.04' + steps: + - name: Download and extract aliyun-cli + run: | + wget https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz + sudo tar -zxvf aliyun-cli-linux-latest-amd64.tgz -C /usr/bin/ + aliyun configure set --profile akProfile --mode AK --region ap-southeast-1 --access-key-id ${{ secrets.ZQ_ALI_AKI }} --access-key-secret ${{ secrets.ZQ_ALI_AKS }} + instanceIds=($(aliyun ecs DescribeInstanceStatus --region ap-southeast-1 --PageSize 50 --RegionId 'ap-southeast-1' | jq -r '.InstanceStatuses.InstanceStatus | map(.InstanceId)[]')) + for id in "${instanceIds[@]}"; do + echo "开始释放云服务器: $id" + aliyun ecs DeleteInstance --region ap-southeast-1 --InstanceId "$id" --Force true --TerminateSubscription true + done \ No newline at end of file diff --git a/grafana-dashboards/application/pod.json b/grafana-dashboards/application/pod.json index 86867ee..c185fc7 100644 --- a/grafana-dashboards/application/pod.json +++ b/grafana-dashboards/application/pod.json @@ -24,7 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 20, + "id": 17, "links": [], "liveNow": false, "panels": [ @@ -935,7 +935,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_pod_container_resource_requests_cpu_cores{pod=~\"$pod\"}) or vector(0)", + "expr": "sum(kube_pod_container_resource_requests{resource=\"cpu\", pod=~\"$pod\"}) or vector(0)", "format": "time_series", "instant": true, "legendFormat": "CPU (cores)", @@ -948,7 +948,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_resource_requests_memory_bytes{pod=~\"$pod\"}) or vector(0)", + "expr": "sum(kube_pod_container_resource_requests{resource=\"memory\", pod=~\"$pod\"}) or vector(0)", "format": "time_series", "hide": false, "legendFormat": "Memory", @@ -1038,7 +1038,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_pod_container_resource_limits_cpu_cores{pod=~\"$pod\"}) or vector(0)", + "expr": "sum(kube_pod_container_resource_limits{resource=\"cpu\", pod=~\"$pod\"}) or vector(0)", "format": "time_series", "instant": true, "legendFormat": "CPU (cores)", @@ -1051,7 +1051,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_resource_limits_memory_bytes{pod=~\"$pod\"}) or vector(0)", + "expr": "sum(kube_pod_container_resource_limits{resource=\"memory\", pod=~\"$pod\"}) or vector(0)", "format": "time_series", "hide": false, "legendFormat": "Memory", diff --git a/grafana-dashboards/cluster/cluster-overview.json b/grafana-dashboards/cluster/cluster-overview.json index 2121ebd..9623758 100644 --- a/grafana-dashboards/cluster/cluster-overview.json +++ b/grafana-dashboards/cluster/cluster-overview.json @@ -24,7 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 6, + "id": 2, "links": [], "liveNow": false, "panels": [ @@ -2405,7 +2405,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(10, sum(irate(container_network_receive_bytes_total{image!=\"\",name=~\"^K8S_.*\"}[2m])) by (pod))", + "expr": "topk(10, sum(irate(container_network_receive_bytes_total{image!=\"\",name=~\"^k8s_.*\"}[2m])) by (pod))", "hide": false, "instant": false, "interval": "", @@ -2423,7 +2423,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "-topk(10, sum(irate(container_network_transmit_bytes_total{image!=\"\",name=~\"^K8S_.*\"}[2m])) by (pod))", + "expr": "-topk(10, sum(irate(container_network_transmit_bytes_total{image!=\"\",name=~\"^k8s_.*\"}[2m])) by (pod))", "instant": false, "interval": "", "intervalFactor": 1, @@ -3081,6 +3081,6 @@ "timezone": "", "title": "集群监控概览", "uid": "cluster-overview", - "version": 3, + "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/grafana-dashboards/rainbond/component.json b/grafana-dashboards/rainbond/component.json index 6a2c863..81835b1 100644 --- a/grafana-dashboards/rainbond/component.json +++ b/grafana-dashboards/rainbond/component.json @@ -25,7 +25,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 67, + "id": 9, "links": [ { "asDropdown": false, @@ -64,7 +64,8 @@ }, { "datasource": { - "uid": "$datacenter" + "type": "prometheus", + "uid": "${datacenter}" }, "description": "", "fieldConfig": { @@ -256,13 +257,15 @@ } ] }, - "pluginVersion": "9.3.0-beta.1", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { - "uid": "$datacenter" + "type": "prometheus", + "uid": "${datacenter}" }, - "expr": "kube_pod_container_status_ready{exported_namespace =\"rbd-system\"} - 0", + "editorMode": "code", + "expr": "kube_pod_container_status_ready{namespace =\"rbd-system\"} - 0", "format": "table", "instant": true, "interval": "", @@ -271,9 +274,11 @@ }, { "datasource": { - "uid": "$datacenter" + "type": "prometheus", + "uid": "${datacenter}" }, - "expr": "kube_pod_container_status_restarts_total{exported_namespace =\"rbd-system\"} - 0", + "editorMode": "code", + "expr": "kube_pod_container_status_restarts_total{namespace =\"rbd-system\"} - 0", "format": "table", "instant": true, "interval": "", @@ -367,6 +372,7 @@ }, { "datasource": { + "type": "prometheus", "uid": "$datacenter" }, "fieldConfig": { @@ -471,15 +477,17 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "9.3.0-beta.1", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { "uid": "$datacenter" }, + "editorMode": "code", "expr": "mysql_up{namespace=\"rbd-system\"} - 0", "interval": "", "legendFormat": "status", + "range": true, "refId": "A" } ], @@ -541,7 +549,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "9.3.0-beta.1", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -620,7 +628,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "9.3.0-beta.1", + "pluginVersion": "9.3.16", "targets": [ { "calculatedInterval": "10m", @@ -698,7 +706,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.3.0-beta.1", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -766,12 +774,6 @@ "description": "在这个统计图内部我们可以看到 MySQL 产生了多少网络流量。\n\n* 出站流量是 MySQL 发送的网络流量。\n* 入站流量是 MySQL 接收的网络流量。", "editable": true, "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 6, "fillGradient": 0, "grid": {}, @@ -804,7 +806,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 5, "points": false, "renderer": "flot", @@ -891,12 +893,6 @@ "description": "当某个客户端连接到 MySQL 时，连接异常中断，而 MySQL 会将该信息保存在异常表当中。\n\n如果没有连接异常的数量到达 ``max_connect_errors`` 的值，mysqld 将会假定有错误并且进一步阻止客户的进一步连接。如果要允许该客户端再次连接，需要执行 ``FLUSH HOSTS`` 命令。", "editable": true, "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 2, "fillGradient": 0, "grid": {}, @@ -928,7 +924,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 5, "points": false, "renderer": "flot", @@ -1018,12 +1014,6 @@ "description": "慢查询的定义是比 ``long_query_time`` 所设置的值还要慢的查询，例如你把 ``long_query_time`` 的值设置为 3 ，那么需要超过 3 秒之后才能够完成的查询就是慢查询，这些查询会被统计到本图当中。", "editable": true, "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 2, "fillGradient": 0, "grid": {}, @@ -1053,7 +1043,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 5, "points": false, "renderer": "flot", @@ -1149,7 +1139,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [ { "options": { @@ -1177,7 +1166,8 @@ "mode": "absolute", "steps": [ { - "color": "#d44a3a" + "color": "#d44a3a", + "value": null }, { "color": "semi-dark-green", @@ -1204,7 +1194,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1245,7 +1236,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -1268,12 +1259,6 @@ "datasource": { "uid": "$datacenter" }, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1301,7 +1286,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 5, "points": false, "renderer": "flot", @@ -1362,12 +1347,6 @@ "description": "", "editable": true, "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 0, "fillGradient": 0, "gridPos": { @@ -1395,7 +1374,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 5, "points": false, "renderer": "flot", @@ -1456,12 +1435,6 @@ "datasource": { "uid": "$datacenter" }, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1484,8 +1457,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -1544,12 +1520,6 @@ "uid": "$datacenter" }, "description": "99%请求的时延", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1572,8 +1542,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -1658,7 +1631,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [ { "options": { @@ -1686,7 +1658,8 @@ "mode": "absolute", "steps": [ { - "color": "#d44a3a" + "color": "#d44a3a", + "value": null }, { "color": "semi-dark-green", @@ -1713,7 +1686,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1754,7 +1728,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -1777,12 +1751,6 @@ "datasource": { "uid": "$datacenter" }, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1805,8 +1773,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -1910,7 +1881,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [ { "options": { @@ -1938,7 +1908,8 @@ "mode": "absolute", "steps": [ { - "color": "#d44a3a" + "color": "#d44a3a", + "value": null }, { "color": "semi-dark-green", @@ -1965,7 +1936,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2006,7 +1978,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -2030,7 +2002,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "decimals": 0, "mappings": [], "max": 100, @@ -2039,7 +2010,8 @@ "mode": "absolute", "steps": [ { - "color": "light-red" + "color": "light-red", + "value": null }, { "color": "dark-red", @@ -2060,6 +2032,8 @@ "id": 6, "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2071,7 +2045,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -2103,7 +2077,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [], "max": 100, "min": 0, @@ -2111,7 +2084,8 @@ "mode": "absolute", "steps": [ { - "color": "super-light-green" + "color": "super-light-green", + "value": null }, { "color": "semi-dark-green", @@ -2133,6 +2107,8 @@ "links": [], "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -2144,7 +2120,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -2191,25 +2167,6 @@ "type": "prometheus", "uid": "P1CAD159964E9CF7B" }, - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -2232,8 +2189,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -2301,12 +2261,6 @@ "datasource": { "uid": "$datacenter" }, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -2333,7 +2287,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -2488,7 +2442,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [ { "options": { @@ -2516,7 +2469,8 @@ "mode": "absolute", "steps": [ { - "color": "#d44a3a" + "color": "#d44a3a", + "value": null }, { "color": "semi-dark-green", @@ -2543,7 +2497,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2584,7 +2539,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -2609,33 +2564,6 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "thresholds" - }, - "custom": {}, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, "unit": "none" }, "overrides": [] @@ -2664,8 +2592,11 @@ "links": [], "maxDataPoints": 100, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -2748,7 +2679,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [ { "options": { @@ -2776,7 +2706,8 @@ "mode": "absolute", "steps": [ { - "color": "#d44a3a" + "color": "#d44a3a", + "value": null }, { "color": "semi-dark-green", @@ -2803,7 +2734,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2844,7 +2776,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -2868,7 +2800,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "decimals": 2, "mappings": [ { @@ -2887,7 +2818,8 @@ "mode": "absolute", "steps": [ { - "color": "#299c46" + "color": "#299c46", + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2925,7 +2857,7 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -2946,12 +2878,6 @@ "datasource": { "uid": "$datacenter" }, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -2978,7 +2904,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -3071,7 +2997,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [ { "options": { @@ -3099,7 +3024,8 @@ "mode": "absolute", "steps": [ { - "color": "#d44a3a" + "color": "#d44a3a", + "value": null }, { "color": "semi-dark-green", @@ -3126,7 +3052,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3167,7 +3094,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": { @@ -3192,33 +3119,6 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "thresholds" - }, - "custom": {}, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, "unit": "none" }, "overrides": [] @@ -3247,8 +3147,11 @@ "links": [], "maxDataPoints": 100, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -3303,12 +3206,6 @@ "datasource": { "uid": "$datacenter" }, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -3336,7 +3233,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "pointradius": 2, "points": false, "renderer": "flot", @@ -3431,7 +3328,6 @@ "color": { "mode": "thresholds" }, - "custom": {}, "mappings": [], "max": 100, "min": 0, @@ -3439,7 +3335,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3459,6 +3356,8 @@ "id": 27, "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -3470,7 +3369,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "7.1.4", + "pluginVersion": "9.3.16", "targets": [ { "datasource": {