Commit Graph

1899 Commits

Author SHA1 Message Date
devad 304f0c7dae Merge pull request 'Task status statistics' (#118) from devad/pcm-coordinator:master into master
Former-commit-id: 4e3fe85ecd8c3d6a0e3a547164599d180715e4cb
2024-04-19 16:50:33 +08:00
jagger 70fdfe2e95 feat: Task status statistics
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 158b74d8ae362e8e46100ca4712812216d4a7a1c
2024-04-19 16:47:26 +08:00
zhouqunjie 902ec2291f Merge pull request 'amend:hpc overview resp' (#117) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: e69d0cc9189e9edd81d2a86d2642a08df6cfbbfe
2024-04-19 16:26:34 +08:00
zhouqunjie a6fed83267 amend:hpc overview resp
Former-commit-id: 64b50119aa8ce1921bb84ff018df85684b6e9bcb
2024-04-19 16:23:21 +08:00
zhouqunjie 01603bf170 Merge pull request 'hpc resource overview' (#116) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 1d127fdec9ee0ca86e65fefc6dcc35d77e45301b
2024-04-19 16:07:31 +08:00
zhouqunjie 58263827d1 hpc resource overview
Former-commit-id: cfb5c293ce9cb59518c3a202a7519b794cff2aeb
2024-04-19 16:04:36 +08:00
jagger e195bb4d89 Merge branch 'refs/heads/upstream'
Former-commit-id: aabbc1719d3a845983eefacd0614322f32bd2246
2024-04-19 15:45:01 +08:00
jagger 6f9cf73cd4 fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 836d8f7f97db13bab73ba5a9575ef0654caea401
2024-04-19 15:40:01 +08:00
zhangwei 464c6aa5d5 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/desc/core/pcm-core.api


Former-commit-id: b4ae22c9ceb1cba92aaa429b455988e42a132161
2024-04-18 15:56:56 +08:00
zhangwei 79749b3ed7 alert list
Former-commit-id: 454efc36db52ba10f611d5624aa651015801ed28
2024-04-18 15:54:32 +08:00
tzwang 9766e68075 Merge pull request 'updated adapterid to schedule apis' (#115) from tzwang/pcm-coordinator:master into master
Former-commit-id: 4c9cce1bec2a7c28fcc3ffaddf889fe1211095fe
2024-04-17 18:34:36 +08:00
tzwang ddd5433c3b updated handler
Former-commit-id: c5ac28d2220016651e22c509281951c8af4f3192
2024-04-17 18:30:54 +08:00
tzwang cf5d5792ee updated ai scheduler api
Former-commit-id: ebe3c21d6d702b4caccc8c7ba9eccf2012d151bb
2024-04-17 06:17:13 -04:00
tzwang ea7216e153 added adapterId for ai scheduler submit func
Former-commit-id: 94e73c0fd326bf84d26196d97cc70654994ceca2
2024-04-17 17:57:35 +08:00
zhouqunjie 9da9d9a3a6 Merge pull request 'notice impl' (#114) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 945ee35bb94102b198493319e8cba7f499682cf7
2024-04-17 17:35:23 +08:00
Jake 30546cd295 notice impl
Former-commit-id: 7d9d6aff1b85e8dd1f7bc759bfa3bca2f9e2f35f
2024-04-17 17:32:23 +08:00
tzwang a440f41fbf Merge pull request 'updated ai scheduler getdatabases and getalgorithms funcs' (#113) from tzwang/pcm-coordinator:master into master
Former-commit-id: 29a22371cdf945647f9633fbc44f41fa5ceb24d0
2024-04-16 16:55:40 +08:00
tzwang 5d3da2c8a3 updated shuguangai getresources func
Former-commit-id: edfde2b701212c60027fea6f63adb0c1b7c59b24
2024-04-16 16:50:08 +08:00
zhouqunjie 0ebbbfdb85 Merge pull request 'version retract' (#112) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 829e00003dd1e3b2f90d666823d59ca6d763fcb5
2024-04-15 12:11:11 +08:00
Jake 1f40cfaba7 retract version
Former-commit-id: 4bf26036e7a3fbc5b4ed806bf3d6a8e0b86c790e
2024-04-15 12:07:51 +08:00
zhouqunjie 6efe5ea312 Merge pull request 'push resource info' (#111) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: b065b3210b5bca9183ea50cfc733039fd539b2bd
2024-04-15 10:45:07 +08:00
Jake 4c3240c547 Merge branch 'master' of https://gitlink.org.cn/zhouqunjie/pcm-coordinator
# Conflicts:
#	api/internal/types/types.go


Former-commit-id: a15861b50777adaaaea13ac07f12e4b7bb3f33bc
2024-04-15 10:42:09 +08:00
Jake 2c145623fd push hpc resource info
Former-commit-id: ac91ce5f20e4bd295720f44aa822d2a243abce4c
2024-04-15 10:38:44 +08:00
qiwang 9120c935fc Merge pull request 'submit vm model' (#110) from qiwang/pcm-coordinator:master into master
Former-commit-id: fc5e2a0ff0cc9bc46e239079e9c2408260b0c14c
2024-04-12 17:48:52 +08:00
qiwang 773e75f0d6 feat:submit vm model
Former-commit-id: 4955139d43a57a3d3320758060574514b7806b39
2024-04-12 17:44:19 +08:00
tzwang 76ca864472 Merge pull request 'fix ai scheduler bugs' (#109) from tzwang/pcm-coordinator:master into master
Former-commit-id: 1a46411fbc446d3ec4ad0f9adab43ab310a12545
2024-04-11 19:33:11 +08:00
tzwang 997a0de27f fix aischeduler bugs
Former-commit-id: bdf9f72c09b0abf0782c3ca11ef862e0379317fb
2024-04-11 19:29:23 +08:00
tzwang 766ca71dc7 Merge remote-tracking branch 'origin/master'
Former-commit-id: 9e218d5843af15e4bde7b607313e7e222713ff16
2024-04-11 19:21:45 +08:00
tzwang 41c0ed7844 updated scheduleResult api
Former-commit-id: 13291220187c89f4eaa3f76068b46a870cbcdc32
2024-04-11 07:21:04 -04:00
tzwang 7f6b9cf0ca Merge remote-tracking branch 'origin/master'
Former-commit-id: 458812fca278897b6c0c75e5228cde772601287a
2024-04-11 19:14:45 +08:00
zhangwei 47a8d02d9f Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: adc144807105cee2f0b95e6b1e84bcc0d733d3e7
2024-04-11 18:46:33 +08:00
zhangwei 7cbdf8d91b add metrics target
Former-commit-id: 3d7f18b273207725cedbe3007b8acfdaacd8cee8
2024-04-11 18:46:12 +08:00
tzwang 3d320d4ab0 fix aiClusterMap bugs
Former-commit-id: 9a2a5eb7bc32a4977149953a4c556743264e6c4a
2024-04-11 18:29:13 +08:00
zhouqunjie 97572584c2 Merge pull request 'hpc resource overview' (#108) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: cb374bb3241a288d69656ee0b3f7de9a1416be7c
2024-04-11 17:49:29 +08:00
Jake 6d6c7f4e47 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 32aa80967d7e49848cac871a4740bd64f1594fde
2024-04-11 17:46:38 +08:00
Jake 7fce97fb6f hpc resource overview
Former-commit-id: 6fe283469de83c72964bbab474109026c36f018b
2024-04-11 17:45:32 +08:00
tzwang 5601adeffd Merge pull request 'updated ai submit task api and fix bugs' (#107) from tzwang/pcm-coordinator:master into master
Former-commit-id: 7a3214ca2b2fa356df241394923518656359eedb
2024-04-11 17:36:08 +08:00
tzwang 5b0fe44f51 updated schedule clusterId bugs
Former-commit-id: fc08b0aaed230388b70c710f2a77cb91695a7140
2024-04-11 17:31:46 +08:00
jagger 529d333d76 Merge branch 'refs/heads/upmaster'
# Conflicts:
#	api/internal/types/types.go
#	go.sum


Former-commit-id: f3ec691387a3fa5efd919472db09fb04f63e233f
2024-04-10 16:17:34 +08:00
devad 84576a9b7d Merge pull request 'fix dict bugs' (#106) from devad/pcm-coordinator:hot_fix into master
Former-commit-id: 4a51cebc7940f078c2f1515eed518ae66e1d1292
2024-04-10 09:43:58 +08:00
jagger 5da458b1a6 fix dict bugs
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 12dde250bf03664513668fd7e5506796de2934bc
2024-04-10 09:39:11 +08:00
jagger 5d03296353 fix bugs
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 0dfcf5d24e7865fd86bc81278a150c1740da623f
2024-04-10 09:17:47 +08:00
qiwang 864bd92dfb Merge pull request 'Add virtual machine overview interface' (#105) from qiwang/pcm-coordinator:master into master
Former-commit-id: b60efd016c27e70dae68e5daa51483916e514bfb
2024-04-09 16:39:41 +08:00
qiwang 368fe3b279 feat:Add virtual machine overview interface
Former-commit-id: f7e32629352ce159909e33e7fdc0f9317cd72400
2024-04-09 16:31:33 +08:00
zhangwei f2b871bba2 node load
Former-commit-id: 59a88853d68daacd2a0c7dc8627935b49ddf1300
2024-04-09 15:12:44 +08:00
zhangwei d78a523b58 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: ddbc1cb95a1cb26b8793e12ae878ca052059ca7b
2024-04-09 10:30:19 +08:00
zhangwei b3aa276ff7 告警消息查询
Former-commit-id: aba3c3cff2e2e0a92dbeff9f6dd1b3dd6da2eb36
2024-04-09 10:09:26 +08:00
zhouqunjie ef8369baeb Merge pull request 'goctl generate types' (#104) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: c2a9bffb7bd3809aa0921157c48124ddc5668de0
2024-04-08 17:36:12 +08:00
Jake 42ea96a01e goctl generate types
Former-commit-id: 22558cc63e9ad0082999bdada0c82cbd40a291e1
2024-04-08 17:33:07 +08:00
tzwang bad375502f Merge pull request 'updated ai scheduler pcm.api' (#103) from tzwang/pcm-coordinator:master into master
Former-commit-id: fbd8808431d2e291e8cb95e47f88bba1bed49783
2024-04-08 17:29:20 +08:00