Commit Graph

583 Commits

Author SHA1 Message Date
Xiaoyu Wang 0a9675e454 TD-13037 merge 3.0 2022-03-03 22:44:45 -05:00
Shengliang Guan d907200519
Merge pull request #10531 from taosdata/feature/config
monitor
2022-03-03 19:43:19 +08:00
Shengliang Guan c890b0b5c1 sysinfo in monitor 2022-03-03 18:10:56 +08:00
Shengliang Guan c018e91859 minor changes 2022-03-03 17:30:33 +08:00
dapan1121 fa9d652e0e Merge remote-tracking branch 'origin/3.0' into 3.0_query_integrate 2022-03-03 15:40:57 +08:00
dapan1121 e6d510997b
Merge pull request #10513 from taosdata/feature/qnode
Feature/qnode
2022-03-03 15:21:14 +08:00
dapan1121 0729144b5f Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-03 09:10:49 +08:00
dapan1121 09e6462c5f feature/qnode 2022-03-03 09:09:11 +08:00
Shengliang Guan e14ef16667 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-02 17:50:17 +08:00
Shengliang Guan dc30a83f24 monitor 2022-03-02 17:48:39 +08:00
Xiaoyu Wang 213793be49 TD-13747 merge 3.0 2022-03-02 04:24:59 -05:00
Xiaoyu Wang 523855bec5 TD-13747 planner integrate 2022-03-01 21:50:51 -05:00
Shengliang Guan af0815919e
Merge pull request #10493 from taosdata/feature/config
telemetry
2022-03-02 10:05:34 +08:00
Shengliang Guan 29422c6598 telemetry 2022-03-02 09:55:21 +08:00
Shengliang Guan c0196eb0e5
Merge pull request #10477 from taosdata/feature/config
also start taosd when the config file does not exis
2022-03-02 09:33:07 +08:00
Shengliang Guan 66771b8de8 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-02 09:15:59 +08:00
dapan1121 15ed48c3f9 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-02 08:41:48 +08:00
dapan1121 639b5102ce feature/qnode 2022-03-01 19:48:21 +08:00
Shengliang Guan bbcfc1b7b2 update telemetry formater to cjson 2022-03-01 17:13:12 +08:00
Liu Jicong 82c141ede8 merge from 3.0 2022-03-01 15:56:11 +08:00
Liu Jicong 2cb89fe8c1 Merge branch '3.0' into feature/tq 2022-03-01 15:49:26 +08:00
Xiaoyu Wang db8669a3ce TD-13037 merge 3.0 2022-02-28 21:40:50 -05:00
dapan1121 e0faac42c4 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-01 09:50:44 +08:00
afwerar 2b9dc8c7ea [TD-13062]<fix>: file system add stream. 2022-02-28 22:37:32 +08:00
Liu Jicong 21e5ddbb8d refactor tmq msg handle 2022-02-28 20:46:23 +08:00
Xiaoyu Wang 768e05939c TD-13747 New SQL model integration 2022-02-28 04:02:43 -05:00
Shengliang Guan d3b18593b4 minor changes 2022-02-28 15:06:12 +08:00
Shengliang Guan 1360f6b265 tbase64 2022-02-28 10:34:05 +08:00
dapan1121 cda6986125 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-28 09:39:13 +08:00
Shengliang Guan 1929e5b6ac show variables error 2022-02-25 16:33:00 +08:00
dapan1121 e9ff317d9b Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-25 14:31:37 +08:00
dapan1121 bf4efa77cb feature/qnode 2022-02-25 14:30:16 +08:00
Shengliang Guan e25637fe29 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-25 10:05:54 +08:00
afwerar 5a37fdf28f [TD-13062]<fix>: cross platform file system. 2022-02-25 01:47:20 +08:00
Shengliang Guan 6bf4eb6ff7 minor changes 2022-02-24 21:52:05 +08:00
Shengliang Guan 612dd71918 os env 2022-02-24 21:27:13 +08:00
Shengliang Guan 6aab93803c remove mnode cfg 2022-02-24 20:17:48 +08:00
dapan1121 5a383152c4 feature/qnode 2022-02-24 19:45:05 +08:00
Shengliang Guan 2fcf9dc638 charset 2022-02-24 14:31:36 +08:00
Shengliang Guan 10a21ba801 version 2022-02-23 20:50:00 +08:00
Shengliang Guan b045302196 disable telem 2022-02-23 17:55:10 +08:00
Shengliang Guan 5b698b3d4d Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-23 17:33:44 +08:00
Liu Jicong 48283e42e9 new offset management 2022-02-23 16:04:06 +08:00
Shengliang Guan 06a7ba7b80 config integrate with taosd 2022-02-22 19:49:11 +08:00
Shengliang Guan 84fd629b9c Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-21 13:47:48 +08:00
Yihao Deng 507573d52d
Merge branch '3.0' into feature/trans_impl 2022-02-21 00:13:25 +08:00
yihaoDeng 4c19f56686 fix bug 2022-02-21 00:11:35 +08:00
Shengliang Guan 90dd7746d6 minor changes 2022-02-18 21:26:50 +08:00
Shengliang Guan 28dd4f7eaf adjust telemetry code 2022-02-18 21:24:45 +08:00
Shengliang Guan 12d1bf03ac pull telemetry by timer 2022-02-18 17:29:38 +08:00