From a04236a576c8ac0d17caca43d3351f2bc8c97495 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 11 Aug 2017 09:34:56 -0700 Subject: [PATCH] Remove internap in favor of inap This is a step in renaming internap to inap. This removes the old internap provider and Grafana dashboard (though manual action will need to be taken to actually remove it from Grafana). Change-Id: If2f0165b2e412c200d218665819c94e357304a63 --- grafana/nodepool-internap.yaml | 155 --------------------------------- nodepool/nodepool.yaml | 9 -- nodepool/nodepoolv3.yaml | 19 ---- 3 files changed, 183 deletions(-) delete mode 100644 grafana/nodepool-internap.yaml diff --git a/grafana/nodepool-internap.yaml b/grafana/nodepool-internap.yaml deleted file mode 100644 index f0148a692c..0000000000 --- a/grafana/nodepool-internap.yaml +++ /dev/null @@ -1,155 +0,0 @@ -dashboard: - title: 'Nodepool: Internap' - templating: - - name: provider - includeAll: true - multi: true - query: stats.gauges.nodepool.provider.internap-* - 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-internap.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.used) - type: singlestat - valueName: current - - title: Deleting - span: 3 - sparkline: - full: true - show: true - targets: - - target: sumSeries(stats.gauges.nodepool.provider.$provider.nodes.delete) - 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.ServerCreate.mean, '0.001'), 4), 'internap-', '') - - title: Get Server - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ServerGet.mean, '0.001'), 4), 'internap-', '') - - title: Delete Server - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ServerDelete.mean, '0.001'), 4), 'internap-', '') - - title: List Servers - type: graph - span: 4 - leftYAxisLabel: "time" - y_formats: - - s - - none - targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.task.$provider.ServerList.mean, '0.001'), 4), 'internap-', '') - - 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), 'internap-', '') - - 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), 'internap-', '') - - 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), 'internap-', '') - - title: Test Nodes (MTL01) - type: graph - span: 4 - stack: true - tooltip: - value_type: individual - leftYAxisLabel: "nodes" - targets: - - target: alias(stats.gauges.nodepool.provider.internap-mtl01.nodes.building, 'Building') - - target: alias(stats.gauges.nodepool.provider.internap-mtl01.nodes.ready, 'Available') - - target: alias(stats.gauges.nodepool.provider.internap-mtl01.nodes.used, 'In Use') - - target: alias(stats.gauges.nodepool.provider.internap-mtl01.nodes.delete, 'Deleting') - - target: alias(stats.gauges.nodepool.provider.internap-mtl01.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.internap-mtl01.runtime.mean, '0.001'), 'MTL01') diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 90a3e1602d..b8325f50ce 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -608,15 +608,6 @@ providers: private-key: /home/nodepool/.ssh/id_rsa config-drive: true key-name: infra-root-keys - - name: internap-mtl01 - region-name: 'mtl01' - cloud: internap - api-timeout: 60 - boot-timeout: 120 - max-servers: -1 - rate: 0.001 - template-hostname: '{image.name}-{timestamp}' - images: [] - name: inap-mtl01 region-name: 'mtl01' cloud: inap diff --git a/nodepool/nodepoolv3.yaml b/nodepool/nodepoolv3.yaml index 6b01496012..93b487b4dd 100644 --- a/nodepool/nodepoolv3.yaml +++ b/nodepool/nodepoolv3.yaml @@ -51,25 +51,6 @@ providers: flavor-name: 'nodepool' diskimage: ubuntu-xenial key-name: infra-root-keys - - name: internap-mtl01 - region-name: 'mtl01' - cloud: internap - api-timeout: 60 - boot-timeout: 120 - rate: 0.001 - image-name-format: '{image.name}-{timestamp}' - diskimages: - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 0 - labels: - - name: ubuntu-xenial - min-ram: 8000 - name-filter: 'A1.8' - diskimage: ubuntu-xenial - key-name: infra-root-keys - name: inap-mtl01 region-name: 'mtl01' cloud: inap