Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
bea678fd
I
Iotdb
项目概览
apache
/
Iotdb
大约 1 年 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bea678fd
编写于
5月 02, 2020
作者:
X
xiangdong huang
提交者:
Xiangdong Huang
5月 05, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix grafana connect does not use correct time unit
上级
f9606b0a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
18 deletion
+23
-18
docs/UserGuide/7-Ecosystem Integration/1-Grafana.md
docs/UserGuide/7-Ecosystem Integration/1-Grafana.md
+1
-1
grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
...a/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
+20
-16
grafana/src/main/resources/application.properties
grafana/src/main/resources/application.properties
+2
-1
未找到文件。
docs/UserGuide/7-Ecosystem Integration/1-Grafana.md
浏览文件 @
bea678fd
...
...
@@ -153,7 +153,7 @@ isDownSampling=true
# defaut sampling intervals
interval=1m
# aggregation function to use to downsampling the data
# COUNT, FIRST
_VALUE, LAST_VALUE
, MAX_TIME, MAX_VALUE, AVG, MIN_TIME, MIN_VALUE, NOW, SUM
# COUNT, FIRST
, LAST
, MAX_TIME, MAX_VALUE, AVG, MIN_TIME, MIN_VALUE, NOW, SUM
function=avg
```
...
...
grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
浏览文件 @
bea678fd
...
...
@@ -53,7 +53,10 @@ public class BasicDaoImpl implements BasicDao {
private
final
JdbcTemplate
jdbcTemplate
;
private
static
long
TIMESTAMP_RADIX
=
1L
;
private
static
long
TIMESTAMP_RADIX
=
-
1L
;
@Value
(
"${timestamp_precision}"
)
private
String
timestampPrecision
;
@Value
(
"${isDownSampling}"
)
private
boolean
isDownSampling
;
...
...
@@ -68,19 +71,6 @@ public class BasicDaoImpl implements BasicDao {
@Autowired
public
BasicDaoImpl
(
JdbcTemplate
jdbcTemplate
)
{
this
.
jdbcTemplate
=
jdbcTemplate
;
Properties
properties
=
new
Properties
();
String
tsPrecision
=
properties
.
getProperty
(
"timestamp_precision"
,
"ms"
);
switch
(
tsPrecision
)
{
case
"us"
:
TIMESTAMP_RADIX
=
1000
;
break
;
case
"ns"
:
TIMESTAMP_RADIX
=
1000_000
;
break
;
default
:
TIMESTAMP_RADIX
=
1
;
}
logger
.
info
(
"Use timestamp precision {}"
,
tsPrecision
);
}
@Override
...
...
@@ -108,6 +98,19 @@ public class BasicDaoImpl implements BasicDao {
*/
@Override
public
List
<
TimeValues
>
querySeries
(
String
s
,
Pair
<
ZonedDateTime
,
ZonedDateTime
>
timeRange
)
{
if
(
TIMESTAMP_RADIX
==
-
1
)
{
switch
(
timestampPrecision
)
{
case
"us"
:
TIMESTAMP_RADIX
=
1000
;
break
;
case
"ns"
:
TIMESTAMP_RADIX
=
1000_000
;
break
;
default
:
TIMESTAMP_RADIX
=
1
;
}
logger
.
info
(
"Use timestamp precision {}"
,
timestampPrecision
);
}
try
{
return
querySeriesInternal
(
s
,
timeRange
,
function
);
}
catch
(
Exception
e
)
{
...
...
@@ -140,8 +143,9 @@ public class BasicDaoImpl implements BasicDao {
sql
=
String
.
format
(
"SELECT "
+
function
+
"(%s) FROM root.%s WHERE time > %d and time < %d group by (%s, [%d, %d])"
,
s
.
substring
(
s
.
lastIndexOf
(
'.'
)
+
1
),
s
.
substring
(
0
,
s
.
lastIndexOf
(
'.'
)),
from
,
to
,
interval
,
from
,
to
);
s
.
substring
(
s
.
lastIndexOf
(
'.'
)
+
1
),
s
.
substring
(
0
,
s
.
lastIndexOf
(
'.'
)),
from
*
TIMESTAMP_RADIX
,
to
*
TIMESTAMP_RADIX
,
interval
,
from
*
TIMESTAMP_RADIX
,
to
*
TIMESTAMP_RADIX
);
columnName
=
function
+
"(root."
+
s
+
")"
;
}
logger
.
info
(
sql
);
...
...
grafana/src/main/resources/application.properties
浏览文件 @
bea678fd
...
...
@@ -31,6 +31,7 @@ isDownSampling=true
# defaut sampling intervals
interval
=
1m
# aggregation function to use to downsampling the data
# COUNT, FIRST
_VALUE, LAST_VALUE
, MAX_TIME, MAX_VALUE, AVG, MIN_TIME, MIN_VALUE, NOW, SUM
# COUNT, FIRST
, LAST
, MAX_TIME, MAX_VALUE, AVG, MIN_TIME, MIN_VALUE, NOW, SUM
# If it does fail (e.g. due to applying AVG to boolean) it will Fallback to LAST
# notice that from v0.10 on, this parameter is deprecated
function
=
AVG
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录