diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 21:07:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 21:07:48 +0300 |
commit | b5571e6e22cdacc81f78eff5943d68c8ba220fbb (patch) | |
tree | 3677b792f5afe0b4853cee59e166df961993b7e8 /lib | |
parent | f92a53a216e6e7d5037ac701efbee5628f91aa9a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
3 files changed, 27 insertions, 22 deletions
diff --git a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml index e531f6316e1..d73f6ccdb3f 100644 --- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml @@ -72,7 +72,7 @@ dependency_scanning: - $DEPENDENCY_SCANNING_DISABLED - $DS_DISABLE_DIND == 'true' -.analyzer: +.ds-analyzer: extends: dependency_scanning services: [] except: @@ -82,7 +82,7 @@ dependency_scanning: - /analyzer run gemnasium-dependency_scanning: - extends: .analyzer + extends: .ds-analyzer image: name: "$DS_ANALYZER_IMAGE_PREFIX/gemnasium:$DS_MAJOR_VERSION" only: @@ -92,7 +92,7 @@ gemnasium-dependency_scanning: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /ruby|javascript|php/ gemnasium-maven-dependency_scanning: - extends: .analyzer + extends: .ds-analyzer image: name: "$DS_ANALYZER_IMAGE_PREFIX/gemnasium-maven:$DS_MAJOR_VERSION" only: @@ -102,7 +102,7 @@ gemnasium-maven-dependency_scanning: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /\bjava\b/ gemnasium-python-dependency_scanning: - extends: .analyzer + extends: .ds-analyzer image: name: "$DS_ANALYZER_IMAGE_PREFIX/gemnasium-python:$DS_MAJOR_VERSION" only: @@ -112,7 +112,7 @@ gemnasium-python-dependency_scanning: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /python/ bundler-audit-dependency_scanning: - extends: .analyzer + extends: .ds-analyzer image: name: "$DS_ANALYZER_IMAGE_PREFIX/bundler-audit:$DS_MAJOR_VERSION" only: @@ -122,7 +122,7 @@ bundler-audit-dependency_scanning: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /ruby/ retire-js-dependency_scanning: - extends: .analyzer + extends: .ds-analyzer image: name: "$DS_ANALYZER_IMAGE_PREFIX/retire.js:$DS_MAJOR_VERSION" only: diff --git a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml index 75594eeb619..34d84138a8b 100644 --- a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml @@ -50,7 +50,7 @@ sast: - $SAST_DISABLED - $SAST_DISABLE_DIND == 'true' -.analyzer: +.sast-analyzer: extends: sast services: [] except: @@ -60,7 +60,7 @@ sast: - /analyzer run bandit-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/bandit:$SAST_ANALYZER_IMAGE_TAG" only: @@ -70,7 +70,7 @@ bandit-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /python/ brakeman-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/brakeman:$SAST_ANALYZER_IMAGE_TAG" only: @@ -80,7 +80,7 @@ brakeman-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /ruby/ eslint-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/eslint:$SAST_ANALYZER_IMAGE_TAG" only: @@ -90,7 +90,7 @@ eslint-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /javascript/ flawfinder-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/flawfinder:$SAST_ANALYZER_IMAGE_TAG" only: @@ -100,7 +100,7 @@ flawfinder-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /\b(c\+\+|c)\b/ kubesec-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/kubesec:$SAST_ANALYZER_IMAGE_TAG" only: @@ -110,7 +110,7 @@ kubesec-sast: $SCAN_KUBERNETES_MANIFESTS == 'true' gosec-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/gosec:$SAST_ANALYZER_IMAGE_TAG" only: @@ -120,7 +120,7 @@ gosec-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /\bgo\b/ nodejs-scan-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/nodejs-scan:$SAST_ANALYZER_IMAGE_TAG" only: @@ -130,7 +130,7 @@ nodejs-scan-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /javascript/ phpcs-security-audit-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/phpcs-security-audit:$SAST_ANALYZER_IMAGE_TAG" only: @@ -140,7 +140,7 @@ phpcs-security-audit-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /php/ pmd-apex-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/pmd-apex:$SAST_ANALYZER_IMAGE_TAG" only: @@ -150,7 +150,7 @@ pmd-apex-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /apex/ secrets-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/secrets:$SAST_ANALYZER_IMAGE_TAG" only: @@ -159,7 +159,7 @@ secrets-sast: $SAST_DEFAULT_ANALYZERS =~ /secrets/ security-code-scan-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/security-code-scan:$SAST_ANALYZER_IMAGE_TAG" only: @@ -169,7 +169,7 @@ security-code-scan-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /\b(c\#|visual basic\b)/ sobelow-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/sobelow:$SAST_ANALYZER_IMAGE_TAG" only: @@ -179,7 +179,7 @@ sobelow-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /elixir/ spotbugs-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/spotbugs:$SAST_ANALYZER_IMAGE_TAG" only: @@ -189,7 +189,7 @@ spotbugs-sast: $CI_PROJECT_REPOSITORY_LANGUAGES =~ /java\b/ tslint-sast: - extends: .analyzer + extends: .sast-analyzer image: name: "$SAST_ANALYZER_IMAGE_PREFIX/tslint:$SAST_ANALYZER_IMAGE_TAG" only: diff --git a/lib/tasks/gitlab/generate_sample_prometheus_data.rake b/lib/tasks/gitlab/generate_sample_prometheus_data.rake index a988494ca61..250eaaa5568 100644 --- a/lib/tasks/gitlab/generate_sample_prometheus_data.rake +++ b/lib/tasks/gitlab/generate_sample_prometheus_data.rake @@ -8,12 +8,17 @@ namespace :gitlab do sample_metrics_directory_name = Metrics::SampleMetricsService::DIRECTORY FileUtils.mkdir_p(sample_metrics_directory_name) + sample_metrics_intervals = [30.minutes, 180.minutes, 8.hours, 24.hours, 72.hours, 7.days] + metrics.each do |metric| query = metric.query % query_variables - result = environment.prometheus_adapter.prometheus_client.query_range(query, start: 7.days.ago) next unless metric.identifier + result = sample_metrics_intervals.each_with_object({}) do |interval, memo| + memo[interval.to_i / 60] = environment.prometheus_adapter.prometheus_client.query_range(query, start: interval.ago) + end + File.write("#{sample_metrics_directory_name}/#{metric.identifier}.yml", result.to_yaml) end end |