Skip to content
Snippets Groups Projects
Commit ac722af4 authored by Sören Henning's avatar Sören Henning
Browse files

series name per parameter

parent 91b8723a
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ public class MeasurementsController { ...@@ -26,7 +26,7 @@ public class MeasurementsController {
} }
@RequestMapping("/measurements") @RequestMapping("/measurements")
public ArrayNode measurements(@RequestParam(value = "after", defaultValue = "0") final long after) { public ArrayNode measurements(@RequestParam(value = "series") final String series, @RequestParam(value = "after", defaultValue = "0") final long after) {
JsonNodeFactory jsonNodeFactory = JsonNodeFactory.instance; JsonNodeFactory jsonNodeFactory = JsonNodeFactory.instance;
...@@ -34,7 +34,7 @@ public class MeasurementsController { ...@@ -34,7 +34,7 @@ public class MeasurementsController {
final Select statement = QueryBuilder.select("time", "measurement", "prediction", "anomalyscore") final Select statement = QueryBuilder.select("time", "measurement", "prediction", "anomalyscore")
.from("measurements") .from("measurements")
.where(QueryBuilder.eq("series_id", "foo()")) // TODO insert value .where(QueryBuilder.eq("series_id", series))
.and(QueryBuilder.gt("time", after)) .and(QueryBuilder.gt("time", after))
.orderBy(QueryBuilder.asc("time")); .orderBy(QueryBuilder.asc("time"));
final ResultSet results = this.cassandraService.getSession().execute(statement); final ResultSet results = this.cassandraService.getSession().execute(statement);
......
...@@ -39,12 +39,16 @@ ...@@ -39,12 +39,16 @@
visualization.setMeasurements([]); visualization.setMeasurements([]);
var series = getParameterByName("test");
var latestMeasurementTime = 0; var latestMeasurementTime = 0;
function requestNewData() { function requestNewData() {
$.ajax({ $.ajax({
url: "measurements", url: "measurements",
method: "GET", method: "GET",
data: { after: latestMeasurementTime }, data: {
series: series,
after: latestMeasurementTime
},
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
if (data.length > 0) { if (data.length > 0) {
...@@ -59,6 +63,16 @@ ...@@ -59,6 +63,16 @@
}); });
function getParameterByName(name, url) {
if (!url) url = window.location.href;
name = name.replace(/[\[\]]/g, "\\$&");
var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, " "));
}
</script> </script>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment