Skip to content

G
gitlab-ce
Commit 4ca3e5fb authored by Dan Davison's avatar Dan Davison
Browse files
Options

Merge branch 'remove-monitor-tests' into 'master' 

Remove monitor legacy test code

See merge request gitlab-org/gitlab!78209
parents ed72caca 686c8816
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 290 deletions
qa/qa/fixtures/metrics_dashboards/templating.yml
View file @ 4ca3e5fb
......@@ -40,4 +40,4 @@ panel_groups:
- id: pod_memory_working_set1
query_range: 'container_memory_working_set_bytes{pod_name=~"{{pod_name2}}"}/1024/1024'
unit: "MiB"
label: pod_name
label: pod_name
\ No newline at end of file
qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb deleted 100644 → 0
View file @ ed72caca
# frozen_string_literal: true
require_relative 'cluster_with_prometheus'
module QA
RSpec.describe 'Monitor', :orchestrated, :kubernetes, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241448', type: :investigating } do
include_context "cluster with Prometheus installed"
before do
Flow::Login.sign_in_unless_signed_in
@project.visit!
end
it 'configures custom metrics', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348082' do
verify_add_custom_metric
verify_edit_custom_metric
verify_delete_custom_metric
end
it 'duplicates to create dashboard to custom', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348070' do
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
on_dashboard.duplicate_dashboard
expect(on_dashboard).to have_metrics
expect(on_dashboard).to have_edit_dashboard_enabled
end
end
it 'verifies data on filtered deployed environment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348071' do
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
on_dashboard.filter_environment
expect(on_dashboard).to have_metrics
end
end
it 'filters using the quick range', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348083' do
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
on_dashboard.show_last('30 minutes')
expect(on_dashboard).to have_metrics
on_dashboard.show_last('3 hours')
expect(on_dashboard).to have_metrics
on_dashboard.show_last('1 day')
expect(on_dashboard).to have_metrics
end
end
it 'observes cluster health graph', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348074' do
Page::Project::Menu.perform(&:go_to_infrastructure_kubernetes)
Page::Project::Infrastructure::Kubernetes::Index.perform do |cluster_list|
cluster_list.click_on_cluster(@cluster)
end
Page::Project::Infrastructure::Kubernetes::Show.perform do |cluster_panel|
cluster_panel.open_health
cluster_panel.wait_for_cluster_health
end
end
it 'uses templating variables for metrics dashboards', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347636' do
templating_dashboard_yml = Pathname
.new(__dir__)
.join('../../../../fixtures/metrics_dashboards/templating.yml')
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = @project
push.file_name = '.gitlab/dashboards/templating.yml'
push.file_content = File.read(templating_dashboard_yml)
push.commit_message = 'Add templating in dashboard file'
push.new_branch = false
end
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |dashboard|
dashboard.select_dashboard('templating.yml')
expect(dashboard).to have_template_metric('CPU usage GitLab Runner')
expect(dashboard).to have_template_metric('Memory usage Postgresql')
expect(dashboard).to have_templating_variable('GitLab Runner')
expect(dashboard).to have_templating_variable('Postgresql')
end
end
private
def verify_add_custom_metric
Page::Project::Menu.perform(&:go_to_integrations_settings)
Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
Page::Project::Settings::Services::Prometheus.perform do |metrics_panel|
metrics_panel.click_on_new_metric
metrics_panel.add_custom_metric
end
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
expect(on_dashboard).to have_custom_metric('HTTP Requests Total')
end
end
def verify_edit_custom_metric
Page::Project::Menu.perform(&:go_to_integrations_settings)
Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
Page::Project::Settings::Services::Prometheus.perform do |metrics_panel|
metrics_panel.click_on_custom_metric('Business / HTTP Requests Total (req/sec)')
metrics_panel.edit_custom_metric
end
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
expect(on_dashboard).to have_custom_metric('Throughput')
end
end
def verify_delete_custom_metric
Page::Project::Menu.perform(&:go_to_integrations_settings)
Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
Page::Project::Settings::Services::Prometheus.perform do |metrics_panel|
metrics_panel.click_on_custom_metric('Business / Throughput (req/sec)')
metrics_panel.delete_custom_metric
end
Page::Project::Menu.perform(&:go_to_monitor_metrics)
Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
expect(on_dashboard).not_to have_custom_metric('Throughput')
end
end
end
end
qa/qa/specs/features/browser_ui/8_monitor/cluster_with_prometheus.rb deleted 100644 → 0
View file @ ed72caca
# frozen_string_literal: true
module QA
RSpec.shared_context "cluster with Prometheus installed" do
before :all do
@cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
@project = Resource::Project.fabricate_via_api! do |project|
project.name = 'monitoring-project'
project.auto_devops_enabled = true
project.template_name = 'express'
end
deploy_project_with_prometheus
end
def deploy_project_with_prometheus
%w[
CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED
SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED
CONTAINER_SCANNING_DISABLED BROWSER_PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED
].each do |key|
Resource::CiVariable.fabricate_via_api! do |resource|
resource.project = @project
resource.key = key
resource.value = '1'
resource.masked = false
end
end
Flow::Login.sign_in
Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
cluster_settings.project = @project
cluster_settings.cluster = @cluster
cluster_settings.install_runner = true
cluster_settings.install_ingress = true
cluster_settings.install_prometheus = true
end
Resource::Pipeline.fabricate_via_api! do |pipeline|
pipeline.project = @project
end.visit!
Page::Project::Pipeline::Show.perform do |pipeline|
pipeline.click_job('build')
end
Page::Project::Job::Show.perform do |job|
expect(job).to be_successful(timeout: 600)
job.click_element(:pipeline_path)
end
Page::Project::Pipeline::Show.perform do |pipeline|
pipeline.click_job('production')
end
Page::Project::Job::Show.perform do |job|
expect(job).to be_successful(timeout: 1200)
job.click_element(:pipeline_path)
end
end
after :all do
@cluster&.remove!
end
end
end
qa/qa/specs/features/ee/browser_ui/8_monitor/all_monitor_features_spec.rb deleted 100644 → 0
View file @ ed72caca
# frozen_string_literal: true
require_relative '../../../browser_ui/8_monitor/cluster_with_prometheus'
module QA
RSpec.describe 'Monitor', :orchestrated, :kubernetes, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241448', type: :investigating } do
include_context "cluster with Prometheus installed"
before do
Flow::Login.sign_in_unless_signed_in
@project.visit!
end
it 'creates an incident template and opens an incident with template applied', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348081' do
create_incident_template
Page::Project::Menu.perform(&:go_to_monitor_settings)
Page::Project::Settings::Monitor.perform do |settings|
settings.expand_incidents do |incident_settings|
incident_settings.enable_issues_for_incidents
incident_settings.select_issue_template('incident')
incident_settings.save_incident_settings
end
end
create_incident_issue
Page::Project::Issue::Show.perform do |issue|
expect(issue).to have_metrics_unfurled
end
end
private
def verify_metrics(on_dashboard)
on_dashboard.wait_for_metrics
expect(on_dashboard).to have_metrics
end
def create_incident_template
Page::Project::Menu.perform(&:go_to_monitor_metrics)
chart_link = Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
on_dashboard.wait_for_metrics
on_dashboard.copy_link_to_first_chart
end
incident_template = "Incident Metric: #{chart_link}"
push_template_to_repository(incident_template)
end
def push_template_to_repository(template)
@project.visit!
Page::Project::Show.perform(&:create_new_file!)
Page::File::Form.perform do |form|
form.add_name('.gitlab/issue_templates/incident.md')
form.add_content(template)
form.add_commit_message('Add Incident template')
form.commit_changes
end
end
def create_incident_issue
Page::Project::Menu.perform(&:go_to_monitor_incidents)
Page::Project::Monitor::Incidents::Index.perform do |incidents_page|
incidents_page.create_incident
end
Page::Project::Issue::New.perform do |new_issue|
new_issue.fill_title('test incident')
new_issue.create_new_issue
end
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7