Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
csst
Scalebox Apps
Commits
afdb7cf7
Commit
afdb7cf7
authored
1 year ago
by
Zhang Xiaoli
Browse files
Options
Download
Email Patches
Plain Diff
日志格式调整
parent
ed3e586d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
7 deletions
+51
-7
L1/dockerfiles/collector/Dockerfile
L1/dockerfiles/collector/Dockerfile
+12
-0
L1/dockerfiles/collector/Makefile
L1/dockerfiles/collector/Makefile
+19
-0
L1/dockerfiles/collector/ReadMe.MD
L1/dockerfiles/collector/ReadMe.MD
+17
-0
L1/dockerfiles/collector/collector.sh
L1/dockerfiles/collector/collector.sh
+3
-7
No files found.
L1/dockerfiles/collector/Dockerfile
0 → 100644
View file @
afdb7cf7
FROM
hub.cstcloud.cn/scalebox/agent
LABEL
maintainer="Xiaoli Zhang<zhangxiaoli@cnic.cn>"
COPY
run.sh /app/bin/
RUN
chmod
+x /app/bin/run.sh
COPY
--from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
RUN
mkdir
/work/
WORKDIR
/work/
ENTRYPOINT
["goagent"]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
L1/dockerfiles/collector/Makefile
0 → 100644
View file @
afdb7cf7
IMAGE_NAME
:=
hub.cstcloud.cn/scalebox/collector
IMAGE_PATH
:=
/obsfs/temp
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
dist
:
#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
docker
save
$(IMAGE_NAME)
>
$(IMAGE_PATH)/collector.tar
ssh
c0
docker
load
-i
$(IMAGE_PATH)/collector.tar
ssh
c1
docker
load
-i
$(IMAGE_PATH)/collector.tar
ssh
c2
docker
load
-i
$(IMAGE_PATH)/collector.tar
push
:
docker push
$(IMAGE_NAME)
run
:
docker run
-it
--entrypoint
bash
$(IMAGE_NAME)
down
:
docker stop
$(IMAGE_NAME)
This diff is collapsed.
Click to expand it.
L1/dockerfiles/collector/ReadMe.MD
0 → 100644
View file @
afdb7cf7
# Crontab 设置
## 目录说明
-
每个用户可以有自己的 crontab 文件,存储在 /var/spool/cron 目录中;
-
root 用户的 crontab 文件通常存储在 /etc/crontab 文件中;
## crontab 文件格式
-
每一行代表一个定时任务,格式如下:
```
bash
*
*
*
*
*
command
# 分别表示分钟(0-59)、小时(0-23)、日期(1-31)、月份(1-12)、星期(0-7)和要执行的命令。
#设置为23:56执行此命令
56 23
*
*
*
/home/zhangxiaoli/backup_log.sh
```
56 23
* *
*
/home/csst/collector/backup_log.sh
This diff is collapsed.
Click to expand it.
L1/dockerfiles/collector/collector.sh
View file @
afdb7cf7
#!/bin/bash
# collect meminfo and docker disk
printf
" %-10s %-10s %-15s %-15s %-15s %-15s
\n
"
"Time"
""
"MemTotal"
"MemFree"
"MemAvailable"
"DockerFiles(MB)"
|
tee
-a
/var/log/collector.log
# printf " %-10s %-10s %-15s %-15s %-15s %-15s \n" "Time" "" "MemTotal" "MemFree" "MemAvailable" "DockerFiles(MB)" >> /var/log/collector.log
printf
" %-20s %-15s %-15s %-15s %-15s
\n
"
"Time"
"MemTotal"
"MemFree"
"MemAvailable"
"DockerFiles(MB)"
|
tee
-a
/var/log/collector.log
while
true
do
curDate
=
$(
printf
"%(%Y-%m-%d)T"
-1
)
curTime
=
$(
printf
"%(%H:%M:%S)T"
-1
)
curTime
=
$(
printf
"%(%Y-%m-%dT%H:%M:%S)T"
-1
)
memTotal
=
$(
cat
/proc/meminfo|grep MemTotal|awk
'{print $2 $3}'
)
memFree
=
$(
cat
/proc/meminfo|grep MemFree|awk
'{print $2 $3}'
)
memAva
=
$(
cat
/proc/meminfo|grep MemAvailable|awk
'{print $2 $3}'
)
dockerFiles
=
$(
du
-ms
/var/lib/docker|awk
'{print $1}'
)
printf
" %-10s %-10s %-15s %-15s %-15s %-15s
\n
"
$curDate
$curTime
$memTotal
$memFree
$memAva
$dockerFiles
|
tee
-a
/var/log/collector.log
# printf " %-10s %-10s %-15s %-15s %-15s %-15s \n" $curDate $curTime $memTotal $memFree $memAva $dockerFiles >> /var/log/collector.log
printf
" %-20s %-15s %-15s %-15s %-15s
\n
"
$curTime
$memTotal
$memFree
$memAva
$dockerFiles
|
tee
-a
/var/log/collector.log
sleep
10
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment