Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
0e344740
Unverified
Commit
0e344740
authored
Sep 17, 2020
by
Giordano Ricci
Committed by
GitHub
Sep 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Elasticsearch: Add support for date_nanos type (#27538)
parent
e86ff52d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
public/app/plugins/datasource/elasticsearch/datasource.test.ts
+3
-1
public/app/plugins/datasource/elasticsearch/datasource.ts
+1
-0
No files found.
public/app/plugins/datasource/elasticsearch/datasource.test.ts
View file @
0e344740
...
@@ -384,6 +384,7 @@ describe('ElasticDatasource', function(this: any) {
...
@@ -384,6 +384,7 @@ describe('ElasticDatasource', function(this: any) {
properties
:
{
properties
:
{
'@timestamp'
:
{
type
:
'date'
},
'@timestamp'
:
{
type
:
'date'
},
__timestamp
:
{
type
:
'date'
},
__timestamp
:
{
type
:
'date'
},
'@timestampnano'
:
{
type
:
'date_nanos'
},
beat
:
{
beat
:
{
properties
:
{
properties
:
{
name
:
{
name
:
{
...
@@ -431,6 +432,7 @@ describe('ElasticDatasource', function(this: any) {
...
@@ -431,6 +432,7 @@ describe('ElasticDatasource', function(this: any) {
expect
(
fields
).
toEqual
([
expect
(
fields
).
toEqual
([
'@timestamp'
,
'@timestamp'
,
'__timestamp'
,
'__timestamp'
,
'@timestampnano'
,
'beat.name.raw'
,
'beat.name.raw'
,
'beat.name'
,
'beat.name'
,
'beat.hostname'
,
'beat.hostname'
,
...
@@ -460,7 +462,7 @@ describe('ElasticDatasource', function(this: any) {
...
@@ -460,7 +462,7 @@ describe('ElasticDatasource', function(this: any) {
});
});
const
fields
=
_
.
map
(
fieldObjects
,
'text'
);
const
fields
=
_
.
map
(
fieldObjects
,
'text'
);
expect
(
fields
).
toEqual
([
'@timestamp'
,
'__timestamp'
]);
expect
(
fields
).
toEqual
([
'@timestamp'
,
'__timestamp'
,
'@timestampnano'
]);
});
});
});
});
...
...
public/app/plugins/datasource/elasticsearch/datasource.ts
View file @
0e344740
...
@@ -453,6 +453,7 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
...
@@ -453,6 +453,7 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
integer
:
'number'
,
integer
:
'number'
,
long
:
'number'
,
long
:
'number'
,
date
:
'date'
,
date
:
'date'
,
date_nanos
:
'date'
,
string
:
'string'
,
string
:
'string'
,
text
:
'string'
,
text
:
'string'
,
scaled_float
:
'number'
,
scaled_float
:
'number'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment