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

Add supported app version to 3rd party apps and validation test #520

Merged
merged 3 commits into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ short_name: activemq
long_name: Apache ActiveMQ
minimum_supported_agent_version:
metrics: 2.11.0
supported_app_version: ["Classic 5.8.x-5.16.x", "Artemis 2.x"]
expected_metrics:
- type: workload.googleapis.com/activemq.connection.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.7.0
logging: 2.4.0
supported_app_version: ["2.4"]
expected_metrics:
- type: workload.googleapis.com/apache.current_connections
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.6.0
logging: 2.5.0
supported_app_version: ["3.11", "4.0"]
expected_metrics:
- type: workload.googleapis.com/cassandra.client.request.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ long_name: Apache CouchDB
minimum_supported_agent_version:
metrics: 2.10.0
logging: 2.11.0
supported_app_version: ["2.3+", "3.1+"]
expected_metrics:
- type: workload.googleapis.com/couchdb.average_request_time
value_type: DOUBLE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.10.0
logging: 2.9.0
supported_app_version: ["7.9+"]
expected_metrics:
- type: workload.googleapis.com/elasticsearch.cluster.data_nodes
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.11.0
logging: 2.11.0
supported_app_version: ["2.10.x", "3.2.x", "3.3.x"]
expected_metrics:
- type: workload.googleapis.com/hadoop.name_node.block.corrupt
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.11.0
logging: 2.11.0
supported_app_version: ["1.7.x", "2.3.x", "2.4.x"]
expected_metrics:
- type: workload.googleapis.com/hbase.master.region_server.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ configure_integration: |-
</pre>
minimum_supported_agent_version:
metrics: 2.2.0
supported_app_version: ["Java 16", "Java 11"]
expected_metrics:
- type: workload.googleapis.com/jvm.classes.loaded
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.10.0
logging: 2.10.0
supported_app_version: ["0.8 - 3.0.0"]
expected_metrics:
- type: workload.googleapis.com/kafka.isr.operation.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ short_name: memcached
long_name: Memcached
minimum_supported_agent_version:
metrics: 2.8.0
supported_app_version: ["1.6"]
expected_metrics:
- type: workload.googleapis.com/memcached.bytes
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ long_name: MongoDB
minimum_supported_agent_version:
metrics: 2.11.0
logging: 2.10.0
supported_app_version: ["4.0+"]
expected_metrics:
- type: workload.googleapis.com/mongodb.cache.operations
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.8.0
logging: 2.5.0
supported_app_version: ["8.0", "5.7"]
expected_metrics:
- type: workload.googleapis.com/mysql.buffer_pool_data_pages
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.1.0
logging: 2.1.0
supported_app_version: ["1.18", "1.20"]
expected_metrics:
- type: workload.googleapis.com/nginx.connections_accepted
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.9.0
logging: 2.9.0
supported_app_version: ["10.18+"]
expected_metrics:
- type: workload.googleapis.com/postgresql.backends
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ long_name: RabbitMQ
minimum_supported_agent_version:
metrics: 2.11.0
logging: 2.12.0
supported_app_version: ["3.8", "3.9"]
expected_metrics:
- type: workload.googleapis.com/rabbitmq.consumer.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ long_name: Redis
minimum_supported_agent_version:
metrics: 2.7.0
logging: 2.5.0
supported_app_version: ["6.2"]
expected_metrics:
- type: workload.googleapis.com/redis.clients.blocked
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.10.0
logging: 2.10.0
supported_app_version: ["8.x", "7.7"]
expected_metrics:
- type: workload.googleapis.com/solr.cache.eviction.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.9.0
logging: 2.9.0
supported_app_version: ["10.x", "9.0.x"]
expected_metrics:
- type: workload.googleapis.com/tomcat.errors
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ configure_integration: |-
minimum_supported_agent_version:
metrics: 2.12.0
logging: 2.11.0
supported_app_version: ["26.x", "25.x"]
expected_metrics:
- type: workload.googleapis.com/wildfly.session.count
value_type: INT64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ long_name: Apache Zookeeper
minimum_supported_agent_version:
metrics: 2.10.0
logging: 2.11.0
supported_app_version: ["3.5", "3.6", "3.7"]
expected_metrics:
- type: workload.googleapis.com/zookeeper.connection.active
value_type: INT64
Expand Down
1 change: 1 addition & 0 deletions integration_test/third_party_apps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ type integrationMetadata struct {
ExpectedLogs []expectedLog `yaml:"expected_logs"`
ExpectedMetrics []common.ExpectedMetric `yaml:"expected_metrics"`
MinimumSupportedAgentVersion minimumSupportedAgentVersion `yaml:"minimum_supported_agent_version"`
SupportedAppVersion []string `yaml:"supported_app_version" validate:"required"`
}

// constructQuery converts the given struct of:
Expand Down