Skip to content

Commit 62e99f8

Browse files
committed
Not use anymore Since step
1 parent bdbaa50 commit 62e99f8

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

dist/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ Skydive Analyzer.
3030
![](https://raw.githubusercontent.com/safchain/skydive-grafana-datasource/master/doc/img/query-editor.png)
3131

3232
In order to get metrics the Skydive Gremlin query language is used. You just
33-
need to provide a query that is returning Flows().
33+
need to provide a query that returns Flows. Ex:
3434

35-
The `Dedup` checkbox will add the `Dedup` Gremlin step for you so will
36-
deduplicate Flows by their TrackingID.
35+
```console
36+
G.V().Has('Name', 'br-int').Flows()
37+
```
3738

3839
Refer to the
3940
[Skydive Gremlin section](http://skydive-project.github.io/skydive/getting-started/gremlin/)

dist/datasource.js

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/datasource.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/datasource_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('SkydiveDatasource', function() {
2323

2424
it('should return the server results when a target is set', function(done) {
2525
ctx.backendSrv.datasourceRequest = function(request) {
26-
expect(request.data).to.eql({"GremlinQuery": 'G.At(1).Flows(Since(1)).Has("ParentUUID", "").Dedup("NodeTID").Metrics()'});
26+
expect(request.data).to.eql({"GremlinQuery": 'G.At(1,1).Flows().Has("ParentUUID", "").Dedup("NodeTID").Metrics()'});
2727

2828
return ctx.$q.when({
2929
status: 200,

src/datasource.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ export class SkydiveDatasource {
5555
query = query.replace(/\.Metrics\([^)]*\)/i, '');
5656

5757
// add time context
58-
query = query.replace(/^G\./i, 'G.At(' + request.to + ').');
59-
60-
// add Since predicate to flows
61-
query = query.replace(/\.Flows\([^)]*\)/i, '.Flows(Since(' + (request.to-request.from) + '))');
58+
query = query.replace(/^G\./i, 'G.At(' + request.to + ',' + (request.to-request.from) + ').');
6259

6360
switch (request.mode) {
6461
case "Outer":

0 commit comments

Comments
 (0)