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.

Sign up for GitHub

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

Jump to bottom

Reconfigure storage metrics/alarms to use available disk space #103

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Reconfigure storage metrics/alarms to use available disk space #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cdk/lib/__snapshots__/elastic-search-monitor.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Object {
},
],
"EvaluationPeriods": 2,
"MetricName": "MinFreeDiskSpace",
"MetricName": "MinAvailableDiskSpace",
"Namespace": "deploy/elk",
"Period": 60,
"Statistic": "Minimum",
Expand Down
2 changes: 1 addition & 1 deletion cdk/lib/elastic-search-monitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export class ElasticSearchMonitor extends GuStack {
...lessThanAlarmProps,
alarmDescription: lowStorageDescription,
evaluationPeriods: 2,
metric: metric("MinFreeDiskSpace"),
metric: metric("MinAvailableDiskSpace"),
threshold: fifteenPercentDiskSpaceInBytes,
});
}
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/com/gu/elasticsearchmonitor/CloudwatchMetrics.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ class CloudwatchMetrics(env: Env, cloudWatch: AmazonCloudWatch) {
val nodeMetrics = nodeStats.nodes.flatMap { node =>
val dimensions = defaultDimensions ++ List("InstanceId" -> node.name)
List(
metricDatum("FreeDiskSpace", node.dataFree.toDouble, StandardUnit.Bytes, dimensions, now),
metricDatum("AvailableDiskSpace", node.dataAvailable.toDouble, StandardUnit.Bytes, dimensions, now),
metricDatum("TotalDiskSpace", node.dataTotal.toDouble, StandardUnit.Bytes, dimensions, now),
metricDatum("JvmHeapUsage", node.jvmHeapUsedPercent.toDouble, StandardUnit.Percent, dimensions, now))
}
val dataNodes = nodeStats.nodes.filter(_.isDataNode)
val aggregatedDataNodeMetrics = if (dataNodes.nonEmpty) {
val minFreeDiskSpace = dataNodes.minBy(_.dataFree).dataFree
val sumFreeDiskSpace = dataNodes.map(_.dataFree).sum
val minAvailableDiskSpace = dataNodes.minBy(_.dataAvailable).dataAvailable
val sumAvailableDiskSpace = dataNodes.map(_.dataAvailable).sum
val sumTotalDiskSpace = dataNodes.map(_.dataTotal).sum
val maxJvmHeapUsage = dataNodes.maxBy(_.jvmHeapUsedPercent).jvmHeapUsedPercent
List(
metricDatum("MinFreeDiskSpace", minFreeDiskSpace.toDouble, StandardUnit.Bytes, defaultDimensions, now),
metricDatum("SumFreeDiskSpace", sumFreeDiskSpace.toDouble, StandardUnit.Bytes, defaultDimensions, now),
metricDatum("MinAvailableDiskSpace", minAvailableDiskSpace.toDouble, StandardUnit.Bytes, defaultDimensions, now),
metricDatum("SumAvailableDiskSpace", sumAvailableDiskSpace.toDouble, StandardUnit.Bytes, defaultDimensions, now),
metricDatum("SumTotalDiskSpace", sumTotalDiskSpace.toDouble, StandardUnit.Bytes, defaultDimensions, now),
metricDatum("MaxJvmHeapUsage", maxJvmHeapUsage.toDouble, StandardUnit.Bytes, defaultDimensions, now))
} else Nil
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/com/gu/elasticsearchmonitor/NodeStats.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object NodeStats {

case class Node(
name: String,
dataFree: Long,
dataAvailable: Long,
dataTotal: Long,
jvmHeapUsedPercent: Int,
isDataNode: Boolean)
Expand All @@ -50,7 +50,7 @@ object Node {
def parse(jsonNode: JsonNode): Node = {
Node(
name = jsonNode.get("name").asText,
dataFree = jsonNode.get("fs").get("total").get("free_in_bytes").asLong,
dataAvailable = jsonNode.get("fs").get("total").get("available_in_bytes").asLong,
dataTotal = jsonNode.get("fs").get("total").get("total_in_bytes").asLong,
jvmHeapUsedPercent = jsonNode.get("jvm").get("mem").get("heap_used_percent").asInt,
isDataNode = jsonNode.get("roles").elements().asScala.toList.map(_.asText).contains("data"))
Expand Down
Loading