From dfeb5bb91d134cff315a8465d7e346846282fa1a Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 25 Jan 2018 13:23:19 -0500 Subject: [PATCH] Remove infracloud-chocolate from nodepool Because we've lost access to infracloud-chocolate controller, we cannot properly remove it from nodepool. As such, remove configuration from nodepool and grafana. It was a fun run while it lasted! Change-Id: I589732d76761275b88dd153ff9e55a78d35483eb Signed-off-by: Paul Belanger --- grafana/nodepool-infracloud.yaml | 165 ------------------------------- nodepool/nl02.openstack.org.yaml | 60 ----------- nodepool/nodepool.yaml | 6 -- 3 files changed, 231 deletions(-) delete mode 100644 grafana/nodepool-infracloud.yaml diff --git a/grafana/nodepool-infracloud.yaml b/grafana/nodepool-infracloud.yaml deleted file mode 100644 index 326945cd35..0000000000 --- a/grafana/nodepool-infracloud.yaml +++ /dev/null @@ -1,165 +0,0 @@ -dashboard: - title: 'Nodepool: Infra Cloud' - templating: - - name: provider - includeAll: true - multi: true - query: stats.gauges.nodepool.provider.infracloud-* - refresh: true - type: query - rows: - - title: Description - height: 100px - panels: - - title: Description - content: | - **This dashboard is managed by [Grafyaml](http://docs.openstack.org/infra/system-config/grafyaml.html).** - - If you would like to make changes to this dashboard, please see the grafana directory in [project-config](https://git.openstack.org/cgit/openstack-infra/project-config/tree/grafana/nodepool-infracloud.yaml). - 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.$provider.nodes.building) - type: singlestat - valueName: current - - title: Ready - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.ready) - type: singlestat - valueName: current - - title: In Use - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.in-use) - type: singlestat - valueName: current - - title: Deleting - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.deleting) - type: singlestat - valueName: current - - title: API Operations - showTitle: true - height: 250px - panels: - - title: Create Server - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ComputePostServers.mean, '0.001'), 4), 'infracloud-', '') - - title: Get Server - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ComputeGetServersDetail.mean, '0.001'), 4), 'infracloud-', '') - - title: Delete Server - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ComputeDeleteServers.mean, '0.001'), 4), 'infracloud-', '') - - title: List Servers - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ComputeGetServers.mean, '0.001'), 4), 'infracloud-', '') - - title: Get Limits - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ComputeGetLimits.mean, '0.001'), 4), 'infracloud-', '') - - title: Node Launches - showTitle: true - height: 250px - panels: - - title: Ready Node Launch Attempts - type: graph - span: 4 - nullPointMode: null as zero - leftYAxisLabel: "events / min" - targets: - - target: aliasSub(aliasByNode(summarize(stats_counts.nodepool.launch.provider.$provider.ready, '1m'), 4), 'infracloud-', '') - - title: Error Node Launch Attempts - type: graph - span: 4 - nullPointMode: null as zero - leftYAxisLabel: "events / min" - targets: - - target: aliasSub(aliasByNode(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.$provider.error.*), '1m'), 4), 'infracloud-', '') - - title: Time to Ready - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.launch.provider.$provider.ready.mean, '0.001'), 5), 'infracloud-', '') - - title: Test Nodes (Chocolate) - type: graph - span: 4 - stack: true - tooltip: - value_type: individual - leftYAxisLabel: "nodes" - targets: - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.building, 'Building') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.in-use, 'In Use') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.used, 'Used') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.nodes.deleting, 'Deleting') - - target: alias(stats.gauges.nodepool.provider.infracloud-chocolate.max_servers, 'Max') - seriesOverrides: - - alias: Max - stack: False - - title: Job Runtimes - showTitle: true - height: 250px - panels: - - title: gate-tempest-dsvm-neutron-full - type: graph - span: 6 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.infracloud-chocolate.runtime.mean, '0.001'), 'chocolate') diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index 387ee43ef6..04cc314792 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -280,66 +280,6 @@ providers: diskimage: ubuntu-xenial key-name: infra-root-keys - - name: infracloud-chocolate - region-name: 'RegionOne' - cloud: infracloud-chocolate - boot-timeout: 120 - rate: 0.25 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 0 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: debian-jessie - key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: fedora-26 - key-name: infra-root-keys - - name: fedora-27 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: ubuntu-xenial - key-name: infra-root-keys - diskimages: - name: centos-7 - name: debian-jessie diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 4d439c57bb..0912eac551 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -44,12 +44,6 @@ providers: rate: 0.25 diskimages: *provider_diskimages - - name: infracloud-chocolate - region-name: 'RegionOne' - cloud: infracloud-chocolate - rate: 0.25 - diskimages: *provider_diskimages - - name: ovh-bhs1 region-name: 'BHS1' cloud: ovh