-
Notifications
You must be signed in to change notification settings - Fork 117
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
Add GCP test package #701
Add GCP test package #701
Changes from 7 commits
241fe9a
053265f
315ddfa
665fb75
85b56d1
3205c46
141fc96
ce21b00
5a0a7b9
8d9fc75
a649568
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
dependencies: | ||
ecs: | ||
reference: [email protected] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# Google Cloud Platform Integration | ||
|
||
This integration is used to fetches logs and metrics from | ||
[Google Cloud Platform](https://cloud.google.com/). | ||
|
||
## GCP Credentials | ||
GCP credentials are required for running GCP integration. | ||
|
||
### Configuration parameters | ||
* *project_id*: ID of the GCP project. | ||
* *credentials_file*: Path to JSON file with GCP credentials. Required when not using `credentials_json`. | ||
* *credentials_json*: Raw JSON text of GCP Credentials. Required when not using `credentials_file`. | ||
|
||
#### Data stream specific configuration parameters | ||
* *period*: How often the data stream is executed. | ||
* *region*: Specify which GCP regions to query metrics from. If the `region` | ||
is not set in the config, then by default, the integration will query metrics | ||
from all available GCP regions. If both `region` and `zone` is set, `region` takes precedent. | ||
* *zone*: Specify which GCP zones to query metrics from. If the `zone` | ||
is not set in the config, then by default, the integration will query metrics | ||
from all available GCP zone. If both `region` and `zone` is set, `region` takes precedent. | ||
* *exclude_labels*: Exclude additional labels from metrics. Defaults to false. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Compute | ||
|
||
## Metrics | ||
|
||
This is the `compute` dataset. | ||
|
||
{{event "compute"}} | ||
|
||
{{fields "compute"}} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
# newer versions go on top | ||
- version: "999.999.999" | ||
changes: | ||
- description: "version override for testing" | ||
type: enhancement | ||
link: https://github.com/elastic/elastic-package/pull/701 | ||
- version: "1.2.0" | ||
changes: | ||
- description: Add 8.0.0 version constraint | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/2251 | ||
- description: Add GCP Billing Metricset | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/2141 | ||
- description: Add GCP Compute Metricset | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/2301 | ||
- version: "1.1.2" | ||
changes: | ||
- description: Update Title and Description. | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1965 | ||
- version: "1.1.1" | ||
changes: | ||
- description: Fix logic that checks for the 'forwarded' tag | ||
type: bugfix | ||
link: https://github.com/elastic/integrations/pull/1818 | ||
- version: "1.1.0" | ||
changes: | ||
- description: Update to ECS 1.12.0 | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1661 | ||
- version: "1.0.0" | ||
changes: | ||
- description: Move from experimental to GA | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1568 | ||
- description: remove experimental from data_sets | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1717 | ||
- version: "0.3.3" | ||
changes: | ||
- description: Convert to generated ECS fields | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1478 | ||
- version: '0.3.2' | ||
changes: | ||
- description: update to ECS 1.11.0 | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1385 | ||
- version: "0.3.1" | ||
changes: | ||
- description: Escape special characters in docs | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1405 | ||
- version: "0.3.0" | ||
changes: | ||
- description: Update integration description | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1364 | ||
- version: "0.2.0" | ||
changes: | ||
- description: Set "event.module" and "event.dataset" | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1240 | ||
- version: "0.1.0" | ||
changes: | ||
- description: update to ECS 1.10.0 and adding event.original options | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/1045 | ||
- version: "0.0.2" | ||
changes: | ||
- description: update to ECS 1.9.0 | ||
type: enhancement | ||
link: https://github.com/elastic/integrations/pull/846 | ||
- version: "0.0.1" | ||
changes: | ||
- description: initial release | ||
type: enhancement # can be one of: enhancement, bugfix, breaking-change | ||
link: https://github.com/elastic/integrations/pull/459 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
data "google_compute_image" "default" { | ||
# https://cloud.google.com/compute/docs/images | ||
family = "ubuntu-minimal-2004-lts" | ||
project = "ubuntu-os-cloud" | ||
} | ||
|
||
resource "google_compute_instance" "default" { | ||
name = "test-${var.TEST_RUN_ID}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's add a prefix identifying the instance with elastic-package. The |
||
// NOTE: e2 instance type is required to collect instance/memory/balloon/* | ||
// metrics, available only on those instances. | ||
// https://cloud.google.com/monitoring/api/metrics_gcp | ||
machine_type = "e2-micro" | ||
zone = var.zone | ||
|
||
labels = { | ||
team = "integrations" | ||
run_id = var.TEST_RUN_ID | ||
} | ||
|
||
boot_disk { | ||
initialize_params { | ||
image = data.google_compute_image.default.self_link | ||
} | ||
} | ||
|
||
network_interface { | ||
network = "default" | ||
|
||
access_config { | ||
// Ephemeral public IP | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
version: '2.3' | ||
services: | ||
terraform: | ||
environment: | ||
# pass project id to Terraform | ||
- TF_VAR_gcp_project_id=${GCP_PROJECT_ID} | ||
mtojek marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- GOOGLE_CREDENTIALS=${GOOGLE_CREDENTIALS} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
provider "google" { | ||
project = var.gcp_project_id | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
variable "TEST_RUN_ID" { | ||
default = "detached" | ||
} | ||
|
||
variable "gcp_project_id" { | ||
type = string | ||
} | ||
|
||
variable "zone" { | ||
type = string | ||
// NOTE: if you change this value you **must** change it also for test | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if it possible to read it from the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can pass it like the project id with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can define default variables like this. |
||
// configuration, otherwise the tests will not be able to find metrics in | ||
// the specified region | ||
default = "us-central1-a" | ||
# https://cloud.google.com/compute/docs/regions-zones#available | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# wait_for_data_timeout: 10m | ||
vars: | ||
project_id: "{{TF_VAR_gcp_project_id}}" | ||
credentials_json: '{{{GOOGLE_CREDENTIALS}}}' | ||
data_streams: | ||
vars: ~ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
metricsets: ["compute"] | ||
period: {{period}} | ||
project_id: {{project_id}} | ||
{{#if credentials_file}} | ||
credentials_file_path: {{credentials_file}} | ||
{{/if}} | ||
{{#if credentials_json}} | ||
credentials_json: '{{credentials_json}}' | ||
{{/if}} | ||
{{#if region}} | ||
region: {{region}} | ||
{{/if}} | ||
{{#if zone}} | ||
zone: {{zone}} | ||
{{/if}} | ||
exclude_labels: {{exclude_labels}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
by doing so, aren't you adding this for all the parallel stages regardless whether they interact with GCP or no? I wonder whether this should be done only when needed, and it's feasible?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that's a side effect of refactoring done some time ago. Most likely it can be improved, but let's keep it aside from this PR. It's consistent with AWS at the moment.