Skip to content

add support for heatmaps #1547

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

Merged
brharrington merged 4 commits into from
Apr 28, 2023
Merged

add support for heatmaps #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d358d98
add support for heatmaps
brharrington Apr 27, 2023
cdb2a93
Merge branch 'main' into heatmap3
brharrington Apr 27, 2023
4a7440c
fix formatting
brharrington Apr 27, 2023
566f10c
fix label for color ticks
brharrington Apr 28, 2023
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
18 changes: 16 additions & 2 deletions atlas-chart/src/main/scala/com/netflix/atlas/chart/DefaultGraphEngine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,25 @@ class DefaultGraphEngine extends PngGraphEngine {
config.plots.zipWithIndex.foreach {
case (plot, i) =>
val label = plot.ylabel.map(s => s"Axis $i: $s").getOrElse(s"Axis $i")
belowCanvas += Legend(config.theme.legend, plot, Some(label), showStats, entriesPerPlot)
belowCanvas += Legend(
config.theme.legend,
plot,
graph.heatmaps.get(i),
Some(label),
showStats,
entriesPerPlot
)
}
} else {
config.plots.foreach { plot =>
belowCanvas += Legend(config.theme.legend, plot, None, showStats, entriesPerPlot)
belowCanvas += Legend(
config.theme.legend,
plot,
graph.heatmaps.get(0),
None,
showStats,
entriesPerPlot
)
}
}

Expand Down
97 changes: 96 additions & 1 deletion atlas-chart/src/main/scala/com/netflix/atlas/chart/JsonCodec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ private[chart] object JsonCodec {
config.plots.zipWithIndex.foreach {
case (plot, i) =>
writePlotDefMetadata(gen, plot, i)
writeHeatmapDef(gen, config, plot, i)
}
config.plots.zipWithIndex.foreach {
case (plot, i) =>
Expand Down Expand Up @@ -186,6 +187,76 @@ private[chart] object JsonCodec {
gen.writeEndObject()
}

private def writeHeatmapDef(gen: JsonGenerator, graph: GraphDef, plot: PlotDef, id: Int): Unit = {
plot.heatmapData(graph).foreach { heatmap =>
gen.writeStartObject()
gen.writeStringField("type", "heatmap")
gen.writeNumberField("plot", id)
gen.writeStringField("colorScale", heatmap.settings.colorScale.name())
gen.writeStringField("upper", heatmap.settings.upper.toString)
gen.writeStringField("lower", heatmap.settings.lower.toString)
heatmap.settings.label.foreach { label =>
gen.writeStringField("label", label)
}

// Y-tick information, used to define the vertical buckets for heatmap counts. Included
// so the result can be reproduced in a dynamic rendering.
gen.writeArrayFieldStart("yTicks")
var min = heatmap.yaxis.min
var i = 0
while (i < heatmap.yTicks.size) {
val max = heatmap.yTicks(i).v
gen.writeStartObject()
gen.writeNumberField("min", min)
gen.writeNumberField("max", max)
gen.writeStringField("label", heatmap.yTicks(i).label)
gen.writeEndObject()
min = max
i += 1
}
gen.writeEndArray()

// Color ticks used to map counts to a color
gen.writeArrayFieldStart("colorTicks")
val colorTicks = heatmap.colorTicks
min = heatmap.minCount
i = 1
while (i < colorTicks.size) {
val max = colorTicks(i).v
gen.writeStartObject()
gen.writeFieldName("color")
writeColor(gen, heatmap.palette.colors(i - 1))
gen.writeNumberField("min", min)
gen.writeNumberField("max", max)
gen.writeStringField("label", colorTicks(i).label)
gen.writeEndObject()
min = max
i += 1
}
gen.writeEndArray()

// Output the counts associated with each cell
gen.writeObjectFieldStart("data")
gen.writeStringField("type", "heatmap")
gen.writeArrayFieldStart("values")
var t = heatmap.xaxis.start
while (t < heatmap.xaxis.end) {
gen.writeStartArray()
var y = 0
while (y < heatmap.numberOfValueBuckets) {
gen.writeNumber(heatmap.count(t, y))
y += 1
}
gen.writeEndArray()
t += graph.step
}
gen.writeEndArray()
gen.writeEndObject()

gen.writeEndObject()
}
}

private def writeDataDef(
gen: JsonGenerator,
plot: Int,
Expand Down Expand Up @@ -283,6 +354,7 @@ private[chart] object JsonCodec {
private def readGraphDef(parser: JsonParser): GraphDef = {
var gdef: GraphDef = null
val plots = Map.newBuilder[Int, PlotDef]
val heatmaps = Map.newBuilder[Int, HeatmapDef]
val data = List.newBuilder[(Int, DataDef)]
foreachItem(parser) {
val node = mapper.readTree[JsonNode](parser)
Expand All @@ -295,6 +367,9 @@ private[chart] object JsonCodec {
gdef = toGraphDef(node)
case "plot-metadata" =>
plots += node.get("id").asInt(0) -> toPlotDef(node)
case "heatmap" =>
val plot = node.get("plot").asInt(0)
heatmaps += plot -> toHeatmapDef(node)
case "timeseries" =>
val plot = node.get("plot").asInt(0)
data += plot -> toLineDef(gdef, node)
Expand All @@ -310,13 +385,14 @@ private[chart] object JsonCodec {
}
}

val heatmapData = heatmaps.result()
val groupedData = data.result().groupBy(_._1)

val sortedPlots = plots.result().toList.sortWith(_._1 < _._1)
val plotList = sortedPlots.map {
case (id, plot) =>
val plotLines = groupedData.get(id).map(_.map(_._2)).getOrElse(Nil)
plot.copy(data = plotLines)
plot.copy(data = plotLines, heatmap = heatmapData.get(id))
}

gdef.copy(plots = plotList)
Expand Down Expand Up @@ -410,6 +486,25 @@ private[chart] object JsonCodec {
}
}

private def toHeatmapDef(node: JsonNode): HeatmapDef = {
import scala.jdk.CollectionConverters._
val colors = node
.get("colorTicks")
.elements()
.asScala
.map { node =>
toColor(node.get("color"))
}
.toArray
HeatmapDef(
colorScale = Scale.valueOf(node.get("colorScale").asText()),
upper = PlotBound(node.get("upper").asText()),
lower = PlotBound(node.get("lower").asText()),
palette = Some(Palette.fromArray("heatmap", colors)),
label = Option(node.get("label")).map(_.asText())
)
}

private def toLineDef(gdef: GraphDef, node: JsonNode): LineDef = {
LineDef(
data = toTimeSeries(gdef, node),
Expand Down
Loading