Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
966403c0
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
966403c0
编写于
7月 31, 2020
作者:
D
Daming
提交者:
GitHub
7月 31, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
missing time unit in query (#5210)
上级
78a355e6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
11 deletion
+18
-11
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java
...king/oap/server/storage/plugin/influxdb/InfluxClient.java
+8
-1
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
...erver/storage/plugin/influxdb/query/AggregationQuery.java
+2
-2
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
.../oap/server/storage/plugin/influxdb/query/AlarmQuery.java
+2
-2
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
...ap/server/storage/plugin/influxdb/query/MetricsQuery.java
+2
-2
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
...p/server/storage/plugin/influxdb/query/TopologyQuery.java
+4
-4
未找到文件。
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java
浏览文件 @
966403c0
...
...
@@ -195,7 +195,14 @@ public class InfluxClient implements Client {
/**
* Convert to InfluxDB {@link TimeInterval}.
*/
public
static
TimeInterval
timeInterval
(
long
timeBucket
)
{
public
static
TimeInterval
timeIntervalTS
(
long
timestamp
)
{
return
ti
(
timestamp
,
"ms"
);
}
/**
* Convert to InfluxDB {@link TimeInterval}.
*/
public
static
TimeInterval
timeIntervalTB
(
long
timeBucket
)
{
return
ti
(
TimeBucket
.
getTimestamp
(
timeBucket
),
"ms"
);
}
}
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
浏览文件 @
966403c0
...
...
@@ -79,8 +79,8 @@ public class AggregationQuery implements IAggregationQueryDAO {
});
}
final
SelectSubQueryImpl
<
SelectQueryImpl
>
subQuery
=
where
.
and
(
gte
(
InfluxClient
.
TIME
,
duration
.
getStartTimestamp
(
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
duration
.
getEndTimestamp
(
)))
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeIntervalTS
(
duration
.
getStartTimestamp
()
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeIntervalTS
(
duration
.
getEndTimestamp
()
)))
.
groupBy
(
InfluxConstants
.
TagName
.
ENTITY_ID
);
query
.
setSubQuery
(
subQuery
);
...
...
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
浏览文件 @
966403c0
...
...
@@ -60,8 +60,8 @@ public class AlarmQuery implements IAlarmQueryDAO {
.
from
(
client
.
getDatabase
(),
AlarmRecord
.
INDEX_NAME
)
.
where
();
if
(
startTB
>
0
&&
endTB
>
0
)
{
recallQuery
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
startTB
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
endTB
)));
recallQuery
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
TB
(
startTB
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
TB
(
endTB
)));
}
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
recallQuery
.
and
(
contains
(
AlarmRecord
.
ALARM_MESSAGE
,
keyword
.
replaceAll
(
"/"
,
"\\\\/"
)));
...
...
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
浏览文件 @
966403c0
...
...
@@ -82,8 +82,8 @@ public class MetricsQuery implements IMetricsQueryDAO {
}
queryWhereQuery
.
and
(
gte
(
InfluxClient
.
TIME
,
duration
.
getStartTimestamp
(
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
duration
.
getEndTimestamp
(
)))
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeIntervalTS
(
duration
.
getStartTimestamp
()
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeIntervalTS
(
duration
.
getEndTimestamp
()
)))
.
groupBy
(
InfluxConstants
.
TagName
.
ENTITY_ID
);
List
<
QueryResult
.
Series
>
seriesList
=
client
.
queryForSeries
(
queryWhereQuery
);
...
...
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
浏览文件 @
966403c0
...
...
@@ -194,8 +194,8 @@ public class TopologyQuery implements ITopologyQueryDAO {
.
as
(
ServiceInstanceRelationClientSideMetrics
.
COMPONENT_ID
)
.
from
(
measurement
)
.
where
()
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
startTB
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
endTB
)));
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
TB
(
startTB
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
TB
(
endTB
)));
if
(!
serviceIds
.
isEmpty
())
{
WhereNested
whereNested
=
subQuery
.
andNested
();
...
...
@@ -223,8 +223,8 @@ public class TopologyQuery implements ITopologyQueryDAO {
.
as
(
ServiceInstanceRelationClientSideMetrics
.
COMPONENT_ID
)
.
from
(
measurement
)
.
where
()
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
startTB
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
endTB
)));
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
TB
(
startTB
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
TB
(
endTB
)));
StringBuilder
builder
=
new
StringBuilder
(
"(("
);
builder
.
append
(
sourceCName
).
append
(
"='"
).
append
(
sourceServiceId
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录