Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/alert-manager/build/alertmanager.common.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

FROM prom/alertmanager:v0.29.0
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
containers:
- name: alertmanager
image: {{ cluster_cfg['cluster']['docker-registry']['prefix'] }}alertmanager:{{ cluster_cfg['cluster']['docker-registry']['tag'] }}
imagePullPolicy: Always
args:
- '--config.file=/etc/alertmanager/config.yml'
- '--storage.path=/alertmanager'
Expand Down
4 changes: 3 additions & 1 deletion src/alert-manager/deploy/redis-deployment.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,13 @@ spec:
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
imagePullSecrets:
- name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }}
volumes:
- name: redis-data
hostPath:
path: /data/redis-data
type: ""
- name: redis-config
configMap:
name: redis-config
name: redis-config
2 changes: 2 additions & 0 deletions src/copilot-chat/deploy/copilot-chat-deployment.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ spec:
securityContext:
runAsUser: 0
runAsGroup: 0
imagePullSecrets:
- name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }}
volumes:
- name: copilot-chat-logs
emptyDir: {}
Expand Down
5 changes: 3 additions & 2 deletions src/log-manager/src/nginx/get_log_content.lua
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ end

local log_path = log_dir..log_name
local use_remote_log_dir = false
if path.isdir(log_path) and util.is_directory_empty(log_path) then
if path.isdir(log_path) and util.is_directory_empty(log_path) and remote_log_dir then
ngx.log(ngx.INFO, "falling back to remote log directory")
log_path = remote_log_dir..log_name
log_dir = remote_log_dir
use_remote_log_dir = true
elseif not path.exists(log_path) then
elseif not path.exists(log_path) and remote_log_dir then
ngx.log(ngx.INFO, "path not exist, falling back to remote log directory")
log_path = remote_log_dir..log_name
log_dir = remote_log_dir
Expand Down Expand Up @@ -120,3 +120,4 @@ else
ngx.req.set_uri("/~/current/"..string.sub(path.abspath(log_path), string.len(file_prefix) + 1), true)
end