diff --git a/grafana/create-nodepool.sh b/grafana/create-nodepool.sh index 3a841d8683..d839fed1dc 100755 --- a/grafana/create-nodepool.sh +++ b/grafana/create-nodepool.sh @@ -24,4 +24,3 @@ create Linaro 'linaro-*' nodepool-linaro.yaml create OVH 'ovh-*' nodepool-ovh.yaml create Vexxhost 'vexxhost-*' nodepool-vexxhost.yaml create OSUOSL 'osuosl-*' nodepool-osuosl.yaml -create InMotion 'inmotion-*' nodepool-inmotion.yaml diff --git a/grafana/nodepool-inmotion.yaml b/grafana/nodepool-inmotion.yaml deleted file mode 100644 index a53d085e5f..0000000000 --- a/grafana/nodepool-inmotion.yaml +++ /dev/null @@ -1,252 +0,0 @@ -# -# NOTE: EDIT THE TEMPLATE FILE AND RUN create-nodepool.sh -# - -dashboard: - title: 'Nodepool: InMotion' - templating: - - name: region - includeAll: true - multi: true - query: stats.gauges.nodepool.provider.inmotion-* - refresh: 1 - type: query - rows: - - title: Description - height: 150px - panels: - - title: Description - content: | - InMotion Nodepool Status - ========================== - - This dashboard monitors the status of the nodepool environment for InMotion. - - **This dashboard is managed by [Grafyaml](https://docs.openstack.org/infra/system-config/grafyaml.html).** - If you would like to make changes to this dashboard, please see the template in the `grafana` directory in - [project-config](https://opendev.org/openstack/project-config/src/branch/master/grafana/nodepool.template). - - type: text - - - title: Nodes - showTitle: true - height: 150px - panels: - - title: Building - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$region.nodes.building) - type: singlestat - valueName: current - - title: Ready - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$region.nodes.ready) - type: singlestat - valueName: current - - title: In Use - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$region.nodes.in-use) - type: singlestat - valueName: current - - title: Deleting - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$region.nodes.deleting) - type: singlestat - valueName: current - - - title: Test Nodes - height: 400px - panels: - - title: Test Node History - $region - type: graph - span: 12 - stack: true - repeat: region - minSpan: 4 - tooltip: - value_type: individual - yaxes: - - label: "nodes" - - show: false - targets: - - target: alias(sumSeries(stats.gauges.nodepool.provider.$region.nodes.building), 'Building') - - target: alias(sumSeries(stats.gauges.nodepool.provider.$region.nodes.ready), 'Available') - - target: alias(sumSeries(stats.gauges.nodepool.provider.$region.nodes.in-use), 'In Use') - - target: alias(sumSeries(stats.gauges.nodepool.provider.$region.nodes.used), 'Used') - - target: alias(sumSeries(stats.gauges.nodepool.provider.$region.nodes.deleting), 'Deleting') - - target: alias(sumSeries(stats.gauges.nodepool.provider.$region.max_servers), 'Max') - seriesOverrides: - - alias: Max - stack: False - - - - title: Node Launches - showTitle: true - height: 250px - panels: - - title: Ready Node Launch Attempts - type: graph - span: 4 - lines: false - bars: true - nullPointMode: null as zero - yaxes: - - label: "events / min" - - show: false - targets: - - target: aliasSub(summarize(stats_counts.nodepool.launch.provider.$region.ready, '1m'), '.*stats_counts.nodepool.launch.provider.(.*).ready.*', '\1') - - title: Time to Ready - type: graph - span: 4 - lines: false - bars: true - nullPointMode: null as zero - yaxes: - - label: "time" - format: ms - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.launch.provider.$region.ready.mean, 5) - - title: Error Node Launch Attempts - type: graph - span: 4 - lines: false - bars: true - nullPointMode: null as zero - yaxes: - - label: "events / min" - - show: false - targets: - - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.$region.error.*), '1m'), "All Errors") - - - title: API Operations - showTitle: true - height: 250px - panels: - - title: POST Server - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.compute.POST.servers.*.mean, 4) - - title: GET Server - type: graph - span: 4 - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.server.*.mean, 4) - - title: DELETE Server - type: graph - span: 4 - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.compute.DELETE.server.*.mean, 4) - - title: GET Servers Details - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.servers_detail.*.mean, 4) - - title: GET Limits - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.limits.*.mean, 4) - - title: GET Flavors - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.compute.GET.flavors_detail.*.mean, 4) - - title: GET network floatingips - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.floatingips.*.mean, 4) - - title: GET networks - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.networks.*.mean, 4) - - title: GET network ports - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.ports.*.mean, 4) - - title: GET network subnets - type: graph - lines: true - nullPointMode: connected - span: 4 - yaxes: - - format: ms - label: Time - - show: false - targets: - - target: aliasByNode(stats.timers.nodepool.task.$region.network.GET.subnets.*.mean, 4) diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index c45b4b9690..92f705bbe2 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -29,20 +29,7 @@ labels: - name: ubuntu-xenial - name: openEuler-22-03-LTS -providers: - - name: inmotion-iad3 - region-name: 'iad3' - # Changing this cloud value impacts things like mirror names in jobs. - # It should be changed carefully. - cloud: inmotion - boot-timeout: 120 - launch-timeout: 300 - rate: 0.01 - diskimages: [] - pools: - - name: main - max-servers: 0 - labels: [] +providers: [] diskimages: - name: centos-8-stream diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index d7fe841206..a4a44ee6de 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -120,14 +120,6 @@ providers: image-upload-timeout: 21600 diskimages: *provider_diskimages - - name: inmotion-iad3 - region-name: 'iad3' - cloud: inmotion - rate: 0.25 - # 6 hours - image-upload-timeout: 21600 - diskimages: [] - diskimages: - name: base abstract: True