Skip to content

Commit

Permalink
constant
Browse files Browse the repository at this point in the history
  • Loading branch information
musa-asad committed Dec 17, 2024
1 parent 0533bfa commit c995fc7
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 46 deletions.
5 changes: 5 additions & 0 deletions generator/resources/eks_e2e_prometheus_test_matrix.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[
{
"nodes": 1
}
]
98 changes: 52 additions & 46 deletions test/e2e/jmx/jmx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ func init() {
environment.RegisterEnvironmentMetaDataFlags()
}

const (
NAMESPACE_JVM_TOMCAT = "JVM_TOMCAT_E2E"
NAMESPACE_KAFKA = "KAFKA_E2E"
NAMESPACE_CONTAINERINSIGHTS = "ContainerInsights/Prometheus"
)

var testRegistry = map[string][]func(*testing.T){
"jvm_tomcat.json": {
testTomcatMetrics,
Expand Down Expand Up @@ -204,29 +210,29 @@ func testTomcatMetrics(t *testing.T) {
name string
namespace string
}{
{"tomcat.traffic", "JVM_TOMCAT_E2E"},
{"jvm.classes.loaded", "JVM_TOMCAT_E2E"},
{"jvm.gc.collections.count", "JVM_TOMCAT_E2E"},
{"jvm.gc.collections.elapsed", "JVM_TOMCAT_E2E"},
{"jvm.memory.heap.init", "JVM_TOMCAT_E2E"},
{"jvm.memory.heap.max", "JVM_TOMCAT_E2E"},
{"jvm.memory.heap.used", "JVM_TOMCAT_E2E"},
{"jvm.memory.heap.committed", "JVM_TOMCAT_E2E"},
{"jvm.memory.nonheap.init", "JVM_TOMCAT_E2E"},
{"jvm.memory.nonheap.max", "JVM_TOMCAT_E2E"},
{"jvm.memory.nonheap.used", "JVM_TOMCAT_E2E"},
{"jvm.memory.nonheap.committed", "JVM_TOMCAT_E2E"},
{"jvm.memory.pool.init", "JVM_TOMCAT_E2E"},
{"jvm.memory.pool.max", "JVM_TOMCAT_E2E"},
{"jvm.memory.pool.used", "JVM_TOMCAT_E2E"},
{"jvm.memory.pool.committed", "JVM_TOMCAT_E2E"},
{"jvm.threads.count", "JVM_TOMCAT_E2E"},
{"tomcat.sessions", "JVM_TOMCAT_E2E"},
{"tomcat.errors", "JVM_TOMCAT_E2E"},
{"tomcat.request_count", "JVM_TOMCAT_E2E"},
{"tomcat.max_time", "JVM_TOMCAT_E2E"},
{"tomcat.processing_time", "JVM_TOMCAT_E2E"},
{"tomcat.threads", "JVM_TOMCAT_E2E"},
{"tomcat.traffic", NAMESPACE_JVM_TOMCAT},
{"jvm.classes.loaded", NAMESPACE_JVM_TOMCAT},
{"jvm.gc.collections.count", NAMESPACE_JVM_TOMCAT},
{"jvm.gc.collections.elapsed", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.heap.init", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.heap.max", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.heap.used", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.heap.committed", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.nonheap.init", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.nonheap.max", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.nonheap.used", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.nonheap.committed", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.pool.init", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.pool.max", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.pool.used", NAMESPACE_JVM_TOMCAT},
{"jvm.memory.pool.committed", NAMESPACE_JVM_TOMCAT},
{"jvm.threads.count", NAMESPACE_JVM_TOMCAT},
{"tomcat.sessions", NAMESPACE_JVM_TOMCAT},
{"tomcat.errors", NAMESPACE_JVM_TOMCAT},
{"tomcat.request_count", NAMESPACE_JVM_TOMCAT},
{"tomcat.max_time", NAMESPACE_JVM_TOMCAT},
{"tomcat.processing_time", NAMESPACE_JVM_TOMCAT},
{"tomcat.threads", NAMESPACE_JVM_TOMCAT},
}

for _, metric := range metricsToCheck {
Expand Down Expand Up @@ -270,7 +276,7 @@ func testTomcatSessions(t *testing.T) {

maxSessions, err := awsservice.GetMetricMaximum(
"tomcat.sessions",
"JVM_TOMCAT_E2E",
NAMESPACE_JVM_TOMCAT,
startTime,
endTime,
60,
Expand Down Expand Up @@ -300,9 +306,9 @@ func testKafkaMetrics(t *testing.T) {
name string
namespace string
}{
{"kafka.consumer.fetch-rate", "KAFKA_E2E"},
{"kafka.consumer.total.bytes-consumed-rate", "KAFKA_E2E"},
{"kafka.consumer.total.records-consumed-rate", "KAFKA_E2E"},
{"kafka.consumer.fetch-rate", NAMESPACE_KAFKA},
{"kafka.consumer.total.bytes-consumed-rate", NAMESPACE_KAFKA},
{"kafka.consumer.total.records-consumed-rate", NAMESPACE_KAFKA},
}

for _, metric := range metricsToCheck {
Expand All @@ -319,24 +325,24 @@ func testContainerInsightsMetrics(t *testing.T) {
name string
namespace string
}{
{"jvm_classes_loaded", "ContainerInsights/Prometheus"},
{"jvm_threads_current", "ContainerInsights/Prometheus"},
{"jvm_threads_daemon", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_totalswapspacesize", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_systemcpuload", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_processcpuload", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_freeswapspacesize", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_totalphysicalmemorysize", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_freephysicalmemorysize", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_openfiledescriptorcount", "ContainerInsights/Prometheus"},
{"java_lang_operatingsystem_availableprocessors", "ContainerInsights/Prometheus"},
{"jvm_memory_bytes_used", "ContainerInsights/Prometheus"},
{"jvm_memory_pool_bytes_used", "ContainerInsights/Prometheus"},
{"catalina_manager_activesessions", "ContainerInsights/Prometheus"},
{"catalina_manager_rejectedsessions", "ContainerInsights/Prometheus"},
{"catalina_globalrequestprocessor_requestcount", "ContainerInsights/Prometheus"},
{"catalina_globalrequestprocessor_errorcount", "ContainerInsights/Prometheus"},
{"catalina_globalrequestprocessor_processingtime", "ContainerInsights/Prometheus"},
{"jvm_classes_loaded", NAMESPACE_CONTAINERINSIGHTS},
{"jvm_threads_current", NAMESPACE_CONTAINERINSIGHTS},
{"jvm_threads_daemon", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_totalswapspacesize", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_systemcpuload", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_processcpuload", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_freeswapspacesize", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_totalphysicalmemorysize", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_freephysicalmemorysize", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_openfiledescriptorcount", NAMESPACE_CONTAINERINSIGHTS},
{"java_lang_operatingsystem_availableprocessors", NAMESPACE_CONTAINERINSIGHTS},
{"jvm_memory_bytes_used", NAMESPACE_CONTAINERINSIGHTS},
{"jvm_memory_pool_bytes_used", NAMESPACE_CONTAINERINSIGHTS},
{"catalina_manager_activesessions", NAMESPACE_CONTAINERINSIGHTS},
{"catalina_manager_rejectedsessions", NAMESPACE_CONTAINERINSIGHTS},
{"catalina_globalrequestprocessor_requestcount", NAMESPACE_CONTAINERINSIGHTS},
{"catalina_globalrequestprocessor_errorcount", NAMESPACE_CONTAINERINSIGHTS},
{"catalina_globalrequestprocessor_processingtime", NAMESPACE_CONTAINERINSIGHTS},
}

for _, metric := range metricsToCheck {
Expand Down Expand Up @@ -380,7 +386,7 @@ func testTomcatRejectedSessions(t *testing.T) {

maxRejectedSessions, err := awsservice.GetMetricMaximum(
"catalina_manager_rejectedsessions",
"ContainerInsights/Prometheus",
NAMESPACE_CONTAINERINSIGHTS,
startTime,
endTime,
60,
Expand Down
1 change: 1 addition & 0 deletions test/e2e/prometheus/prometheus_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package prometheus
Empty file.
Empty file.
63 changes: 63 additions & 0 deletions test/e2e/prometheus/resources/sample_apps/memcached-sample.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: memcached-sample
labels:
app: memcached
spec:
replicas: 1
selector:
matchLabels:
app: memcached
template:
metadata:
labels:
app: memcached
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "9150"
spec:
containers:
- name: memcached
image: docker.io/bitnami/memcached:1.6.33
ports:
- containerPort: 11211
resources:
limits:
cpu: 150m
memory: 192Mi
requests:
cpu: 100m
memory: 128Mi
- name: metrics
image: docker.io/bitnami/memcached-exporter:0.15.0
ports:
- containerPort: 9150
resources:
limits:
cpu: 150m
memory: 192Mi
requests:
cpu: 100m
memory: 128Mi
---
apiVersion: v1
kind: Service
metadata:
name: memcached-service
labels:
app: memcached
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "9150"
spec:
selector:
app: memcached
ports:
- name: memcache
port: 11211
targetPort: 11211
- name: metrics
port: 9150
targetPort: 9150

0 comments on commit c995fc7

Please sign in to comment.