From afcda1a448494d482b024e085c7710dd7400d037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pt=C3=A1=C4=8Dek?= Date: Sun, 30 Jul 2023 09:25:23 +0200 Subject: [PATCH] other sensors --- README.md | 3 +++ .../exporter/worker/AndroidCustomExporter.kt | 20 +++++++++++++++++++ .../android/exporter/worker/MetricsEngine.kt | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a1655b5..a3c2b5c 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,9 @@ $ ansible-playbook ansible_playbook.yaml --tags config `android_sensor_hinge_angle_degrees` - How much is the hinge opened `android_sensor_accelerometer{axis}` - Data from the accelerometer `android_sensor_magnetic_field_tesla{axis}` - Data from the magnetic field sensor in base units +`android_sensor_gravity_acceleration` - Data from gravity acceleration sensor, in m/s^2 units +`android_sensor_linear_acceleration` - Data from the Android linear acceleration sensor in m/s^2 units. + ### Miscellaneous diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt index 3064c11..7c4a131 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt @@ -179,6 +179,26 @@ class AndroidCustomExporter(private val metricEngine: MetricsEngine) : Collector addAxisSpecificGauge(gauge, baseUnits) mfs.add(gauge) } + + metricEngine.hwSensorsValues().gravityAcceleration?.let { + val gauge = GaugeMetricFamily( + "android_sensor_gravity_acceleration", + "Gravity acceleration sensor data in m/s^2", + listOf("axis") + ) + addAxisSpecificGauge(gauge, it) + mfs.add(gauge) + } + + metricEngine.hwSensorsValues().linearAcceleration?.let { + val gauge = GaugeMetricFamily( + "android_sensor_linear_acceleration", + "Data from the Android linear acceleration sensor in m/s^2 units.", + listOf("axis") + ) + addAxisSpecificGauge(gauge, it) + mfs.add(gauge) + } } private fun collectScrapeDuration(mfs : MutableList, startTime : Long){ diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt index 40dc274..c22bc41 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt @@ -42,7 +42,7 @@ class HwSensorsCache( var pressureHectoPascal : Double? = null, var proximityCentimeters : Double? = null, //DONE - var gravityAcceleration : AxisSpecificGauge? = null, + var gravityAcceleration : AxisSpecificGauge? = null, //DONE var linearAcceleration : AxisSpecificGauge? = null, var rotationVectorValues : AxisSpecificGauge? = null, var rotationVectorCosinusThetaHalf : Double? = null,