Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #18691 to 7.x: Move service config under stackdriver.metrics and simplify metric_types #18981

Merged
merged 3 commits into from
Jun 5, 2020
Merged

Conversation

kaiyan-sheng
Copy link
Contributor

Cherry-pick of PR #18691 to 7.x branch. Original message:

What does this PR do?

This PR is to move service config parameter from under stackdriver to under stackdriver.metrics. Service name used to only be used for checking metadata. Now it's also been used to construct the full metric_type string to make google cloud API call list.timeseries.

For example, if service=compute and metric_type is given in config as instance/cpu/usage_time, then the full metric.type will be compute/googleapi.com/instance/cpu/usage_time.

This PR also removed the stackdriver config layer. Now instead of stackdriver.metrics, configs are directly under metrics.

Before:

- module: googlecloud
  metricsets:
    - stackdriver
  project_id: "your project id"
  credentials_file_path: "your JSON credentials file path"
  exclude_labels: false
  period: 1m
  stackdriver:
    service: compute
    metrics:
      - aligner: ALIGN_NONE
        metric_types:
          - "compute.googleapis.com/instance/cpu/reserved_cores"
          - "compute.googleapis.com/instance/cpu/usage_time"
          - "compute.googleapis.com/instance/cpu/utilization"
          - "compute.googleapis.com/instance/uptime"

After:

- module: googlecloud
  metricsets:
    - stackdriver
  project_id: "your project id"
  credentials_file_path: "your JSON credentials file path"
  exclude_labels: false
  period: 1m
  metrics:
    - aligner: ALIGN_NONE
      service: compute
      metric_types:
        - "instance/cpu/reserved_cores"
        - "instance/cpu/usage_time"
        - "instance/cpu/utilization"
        - "instance/uptime"

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

  1. Enable googlecloud metricset: ./metricbeat modules enable googlecloud
  2. Change modules.d/googlecloud.yml to below:
- module: googlecloud
  metricsets:
    - stackdriver
  project_id: elastic-observability
  credentials_file_path: "/Users/kaiyansheng/Downloads/elastic-observability-d17781618202.json"
  exclude_labels: false
  period: 1m
  metrics:
    - aligner: ALIGN_NONE
      service: compute
      metric_types:
        - "instance/cpu/reserved_cores"
        - "instance/cpu/usage_time"
        - "instance/cpu/utilization"
        - "instance/uptime"
  1. Metrics googlecloud.stackdriver.instance.cpu.reserved_cores.value, googlecloud.stackdriver.instance.cpu.usage_time.value, googlecloud.stackdriver.instance.cpu.utilization.value and googlecloud.stackdriver.instance.uptime.value should be collected.

…es (#18691)

* Move service name config under stackdriver.metrics and simplify metric_types
* change config stackdriver.metrics to metrics

(cherry picked from commit be501ae)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this Jun 4, 2020
@kaiyan-sheng kaiyan-sheng added the Team:Platforms Label for the Integrations - Platforms team label Jun 4, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 4, 2020

💔 Build Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #18981 updated]

  • Start Time: 2020-06-05T13:21:27.192+0000

  • Duration: 58 min 14 sec

Test stats 🧪

Test Results
Failed 0
Passed 2124
Skipped 465
Total 2589

Steps errors

Expand to view the steps failures

  • Name: Mage goIntegTest
    • Description: mage goIntegTest

    • Duration: 1 min 8 sec

    • Start Time: 2020-06-05T13:44:28.300+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-06-05T14:19:16.720Z] 		at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:265)
[2020-06-05T14:19:16.720Z] 		at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:80)
[2020-06-05T14:19:16.720Z] 		at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:67)
[2020-06-05T14:19:16.720Z] 		at org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47)
[2020-06-05T14:19:16.720Z] 		at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
[2020-06-05T14:19:16.720Z] 		at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-06-05T14:19:16.720Z] 		at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-06-05T14:19:16.720Z] 		at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-06-05T14:19:16.720Z] Caused: hudson.FilePath$TunneledInterruptedException
[2020-06-05T14:19:16.720Z] 	at hudson.FilePath$FileCallableWrapper.call(FilePath.java:3075)
[2020-06-05T14:19:16.720Z] 	at hudson.remoting.UserRequest.perform(UserRequest.java:212)
[2020-06-05T14:19:16.720Z] 	at hudson.remoting.UserRequest.perform(UserRequest.java:54)
[2020-06-05T14:19:16.720Z] 	at hudson.remoting.Request$2.run(Request.java:369)
[2020-06-05T14:19:16.720Z] 	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-06-05T14:19:16.720Z] 	at hudson.remoting.Engine$1.lambda$newThread$0(Engine.java:93)
[2020-06-05T14:19:16.720Z] Caused: java.lang.InterruptedException: java.lang.InterruptedException: no matches found within 10000
[2020-06-05T14:19:16.720Z] 	at hudson.FilePath.act(FilePath.java:1071)
[2020-06-05T14:19:16.720Z] 	at hudson.FilePath.act(FilePath.java:1058)
[2020-06-05T14:19:16.720Z] 	at hudson.FilePath.validateAntFileMask(FilePath.java:2684)
[2020-06-05T14:19:16.720Z] 	at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:265)
[2020-06-05T14:19:16.720Z] 	at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:80)
[2020-06-05T14:19:16.720Z] 	at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:67)
[2020-06-05T14:19:16.720Z] 	at org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-06-05T14:19:16.720Z] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-06-05T14:19:16.720Z] 	at java.lang.Thread.run(Thread.java:748)
[2020-06-05T14:19:16.720Z] No artifacts found that match the file pattern "**/build/TEST*.out". Configuration error?
[2020-06-05T14:19:17.086Z] + curl -sSLo codecov https://codecov.io/bash
[2020-06-05T14:19:17.348Z] + FILE=auditbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f auditbeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=filebeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f filebeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=heartbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f heartbeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=libbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f libbeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=metricbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f metricbeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=packetbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f packetbeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=winlogbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f winlogbeat/build/coverage/full.cov ]
[2020-06-05T14:19:17.348Z] + FILE=journalbeat/build/coverage/full.cov
[2020-06-05T14:19:17.348Z] + [ -f journalbeat/build/coverage/full.cov ]
[2020-06-05T14:19:18.593Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats
[2020-06-05T14:19:18.926Z] + find . -type f -name TEST*.xml -path */build/* -delete
[2020-06-05T14:19:18.938Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Lint
[2020-06-05T14:19:19.014Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests
[2020-06-05T14:19:19.086Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-06-05T14:19:19.160Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-06-05T14:19:19.230Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-Windows
[2020-06-05T14:19:19.302Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-06-05T14:19:19.372Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-06-05T14:19:19.447Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats/Metricbeat-Python-integration-tests
[2020-06-05T14:19:19.810Z] + cat
[2020-06-05T14:19:19.810Z] + /usr/local/bin/runbld ./runbld-script
[2020-06-05T14:19:19.810Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-06-05T14:19:26.424Z] runbld>>> runbld started
[2020-06-05T14:19:26.424Z] runbld>>> 1.6.11/a66728ff8f4356963772e6e6d2069392fa06acbe
[2020-06-05T14:19:28.347Z] runbld>>> The following profiles matched the job 'Beats/beats-beats-mbp/PR-18981' in order of occurrence in the config (last value wins).
[2020-06-05T14:19:29.740Z] runbld>>> Debug logging enabled.
[2020-06-05T14:19:29.740Z] runbld>>> Storing result
[2020-06-05T14:19:29.740Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-06-05T14:19:29.740Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200605141929-67BDE245
[2020-06-05T14:19:29.740Z] runbld>>> Adding system facts.
[2020-06-05T14:19:30.703Z] runbld>>> Adding vcs info for the latest commit:  c78494d62a5a32ad25e4ec04cb330b1c3028fcef
[2020-06-05T14:19:30.965Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-06-05T14:19:30.965Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-06-05T14:19:30.965Z] Processing JUnit reports with runbld...
[2020-06-05T14:19:30.965Z] + echo 'Processing JUnit reports with runbld...'
[2020-06-05T14:19:31.537Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-06-05T14:19:31.537Z] runbld>>> DURATION: 12ms
[2020-06-05T14:19:31.537Z] runbld>>> STDOUT: 40 bytes
[2020-06-05T14:19:31.537Z] runbld>>> STDERR: 49 bytes
[2020-06-05T14:19:31.537Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-06-05T14:19:31.537Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats
[2020-06-05T14:19:32.924Z] runbld>>> Storing build metadata: 
[2020-06-05T14:19:32.924Z] runbld>>> Adding test report.
[2020-06-05T14:19:32.924Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981/src/github.com/elastic/beats
[2020-06-05T14:19:33.867Z] runbld>>> Found 11 test output files
[2020-06-05T14:19:34.816Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 2589 Skipped: 413
[2020-06-05T14:19:35.078Z] runbld>>> Storing result
[2020-06-05T14:19:35.078Z] runbld>>> FAILURES: 0
[2020-06-05T14:19:35.078Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-06-05T14:19:35.078Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200605141929-67BDE245
[2020-06-05T14:19:35.078Z] runbld>>> Email notification disabled by environment variable.
[2020-06-05T14:19:35.078Z] runbld>>> Slack notification disabled by environment variable.
[2020-06-05T14:19:40.568Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18981
[2020-06-05T14:19:40.662Z] [INFO] getVaultSecret: Getting secrets
[2020-06-05T14:19:40.715Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-06-05T14:19:41.401Z] + chmod 755 generate-build-data.sh
[2020-06-05T14:19:41.401Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18981/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18981/runs/2 FAILURE 3493949
[2020-06-05T14:19:41.401Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18981/runs/2/steps/?limit=10000 -o steps-info.json
[2020-06-05T14:19:41.951Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18981/runs/2/tests/?status=FAILED -o tests-errors.json
[2020-06-05T14:19:42.202Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18981/runs/2/log/ -o pipeline-log.txt

@kaiyan-sheng kaiyan-sheng merged commit 4d6cd60 into elastic:7.x Jun 5, 2020
@kaiyan-sheng kaiyan-sheng deleted the backport_18691_7.x branch June 5, 2020 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport review Team:Platforms Label for the Integrations - Platforms team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants