Skip to content

Commit 8a59bf6

Browse files
committed
fjern Influx, som skal utfases i Nav
1 parent 9232ff2 commit 8a59bf6

File tree

6 files changed

+27
-65
lines changed

6 files changed

+27
-65
lines changed

.nais/nais-dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ spec:
1111
ingresses:
1212
- https://hm-soknadsbehandling-db.intern.dev.nav.no
1313
envFrom:
14-
- secret: hm-influxdb-secret
1514
- secret: hm-slack-hook
1615
kafka:
1716
pool: nav-dev

.nais/nais-prod.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ metadata:
99
spec:
1010
image: {{ image }}
1111
envFrom:
12-
- secret: hm-influxdb-secret
1312
- secret: hm-slack-hook
1413
kafka:
1514
pool: nav-prod
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package no.nav.hjelpemidler.soknad.db.metrics
2+
3+
import io.github.oshai.kotlinlogging.KotlinLogging
4+
import no.nav.hjelpemidler.behovsmeldingsmodell.BehovsmeldingStatus
5+
import no.nav.hjelpemidler.soknad.db.metrics.kafka.KafkaClient
6+
import no.nav.hjelpemidler.soknad.db.metrics.kafka.createKafkaClient
7+
8+
private val logg = KotlinLogging.logger {}
9+
10+
class BigQueryClient {
11+
private val kafkaClient: KafkaClient = createKafkaClient()
12+
13+
private fun writeEvent(measurement: String, fields: Map<String, Any>, tags: Map<String, String>) {
14+
kafkaClient.hendelseOpprettet(measurement, fields, tags)
15+
}
16+
17+
fun registerElapsedTime(metricFieldName: String, tid: Long) {
18+
writeEvent(metricFieldName, mapOf("elapsed_ms" to tid), emptyMap())
19+
}
20+
21+
fun registerStatusCounts(metricFieldName: String, antallByStatus: Map<BehovsmeldingStatus, Int>) {
22+
writeEvent(metricFieldName, antallByStatus.mapKeys { it.key.toString() }, emptyMap())
23+
}
24+
}

app/src/main/kotlin/no/nav/hjelpemidler/soknad/db/metrics/InfluxDB.kt

Lines changed: 0 additions & 54 deletions
This file was deleted.

app/src/main/kotlin/no/nav/hjelpemidler/soknad/db/metrics/Metrics.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ private val logg = KotlinLogging.logger {}
2121

2222
class Metrics(
2323
private val transaction: Transaction,
24-
private val influxDB: InfluxDB = InfluxDB(),
24+
private val bigQuery: BigQueryClient = BigQueryClient(),
2525
) {
2626
init {
2727
Timer("metrics", true).schedule(
@@ -116,7 +116,7 @@ class Metrics(
116116
metricFieldName.plus("-papir")
117117
}
118118

119-
influxDB.registerElapsedTime(finalMetricFieldName, timeDifference)
119+
bigQuery.registerElapsedTime(finalMetricFieldName, timeDifference)
120120
}
121121
} catch (e: Exception) {
122122
logg.error(e) { "Feil ved sending av tid mellom status-metrikker" }
@@ -127,7 +127,7 @@ class Metrics(
127127
try {
128128
val antallByStatus = transaction { søknadStore.tellStatuser() }
129129
if (antallByStatus.isNotEmpty()) {
130-
influxDB.registerStatusCounts(COUNT_OF_SOKNAD_BY_STATUS, antallByStatus)
130+
bigQuery.registerStatusCounts(COUNT_OF_SOKNAD_BY_STATUS, antallByStatus)
131131
}
132132
} catch (e: Exception) {
133133
logg.error(e) { "Feil ved sending antall per status metrikker." }

app/src/main/resources/local.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,3 @@ HM_ROLLER_URL = http://hm-roller
1414
HM_ROLLER_AUDIENCE = hm-soknadsbehandling-db
1515

1616
BIGQUERY_DATASET_ID = hm_soknadsbehandling_v1_dataset_dev_local
17-
18-
INFLUX_HOST = http://localhost
19-
INFLUX_PORT = 9900
20-
INFLUX_DATABASE_NAME = test
21-
INFLUX_USER = test
22-
INFLUX_PASSWORD = test

0 commit comments

Comments
 (0)