UI sync & Update Java agent and satellite commit ID for testing. (#9239)
* Sync UI * Update Java agent and satellite commit ID for testing. * Fix e2e * Fix Satellite plugin names Co-authored-by: wankai123 <wankai123@foxmail.com> Co-authored-by: mrproliu <741550557@qq.com>
This commit is contained in:
parent
d3e38ec697
commit
cc282232e4
|
|
@ -12,7 +12,10 @@
|
|||
|
||||
* Fix query conditions for the browser logs.
|
||||
* Implement a url parameter to activate tab index.
|
||||
* Fix clear interval fail when switch autoRefresh to off
|
||||
* Fix clear interval fail when switch autoRefresh to off.
|
||||
* Optimize log tables.
|
||||
* Fix log detail pop-up page doesn't work.
|
||||
* Optimize table widget to hide the whole metric column when no metric is set.
|
||||
|
||||
#### Documentation
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7813c9267338166d83f4f840ed439f816cd41108
|
||||
Subproject commit 4c762a2458e094e5b2b48022fa571b9bedc88842
|
||||
|
|
@ -42,7 +42,7 @@ pipes:
|
|||
gatherer:
|
||||
server_name: "grpc-server"
|
||||
receiver:
|
||||
plugin_name: "grpc-nativelog-receiver"
|
||||
plugin_name: "grpc-native-log-receiver"
|
||||
queue:
|
||||
plugin_name: "mmap-queue"
|
||||
segment_size: 524288
|
||||
|
|
@ -58,5 +58,5 @@ pipes:
|
|||
min_flush_events: 5
|
||||
client_name: kafka-client
|
||||
forwarders:
|
||||
- plugin_name: nativelog-kafka-forwarder
|
||||
topic: skywalking-logs
|
||||
- plugin_name: native-log-kafka-forwarder
|
||||
topic: skywalking-logs
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ logs:
|
|||
serviceid: {{ b64enc "e2e-service-provider" }}.1
|
||||
serviceinstancename: provider1
|
||||
serviceinstanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
endpointname: null
|
||||
endpointid: null
|
||||
endpointname: POST:/users
|
||||
endpointid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/users" }}
|
||||
traceid: {{ .traceid }}
|
||||
timestamp: {{ gt .timestamp 0 }}
|
||||
contenttype: TEXT
|
||||
|
|
@ -35,4 +35,4 @@ logs:
|
|||
- key: thread
|
||||
value: {{ notEmpty .value }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ logs:
|
|||
serviceid: {{ b64enc "e2e-service-provider" }}.1
|
||||
serviceinstancename: provider1
|
||||
serviceinstanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
endpointname: null
|
||||
endpointid: null
|
||||
endpointname: POST:/info
|
||||
endpointid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/info" }}
|
||||
traceid: {{ .traceid }}
|
||||
timestamp: {{ gt .timestamp 0 }}
|
||||
contenttype: TEXT
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
SW_AGENT_JAVA_COMMIT=65032a9b485411363b5297fadc970115d22b13b8
|
||||
SW_AGENT_SATELLITE_COMMIT=1987e1d566ac90f6b58a45fd9bfa27bf8faad635
|
||||
SW_AGENT_JAVA_COMMIT=b83865f6cd9477f12c8ae8bc3379c31d7d105072
|
||||
SW_AGENT_SATELLITE_COMMIT=ea27a3f4e126a24775fe12e2aa2695bcb23d99c3
|
||||
SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa
|
||||
SW_AGENT_NODEJS_COMMIT=2e7560518aff846befd4d6bc815fe5e38c704a11
|
||||
SW_AGENT_GO_COMMIT=4af380c2db6243106b0fc650b6003ce3b3eb82a0
|
||||
|
|
|
|||
Loading…
Reference in New Issue