diff --git a/READmE.md b/READmE.md index 0efbb88..f19dca0 100644 --- a/READmE.md +++ b/READmE.md @@ -1 +1,73 @@ -## How to +## 如何重新创建整个namespace + +``` +./init.sh +``` +``` +``` + +下面都都不用看了, 直接执行上面的语句 + +先删了 namespace efk，这样里面资源就都没了，除了pv +然后 microk8s.kubectl create namespace efk + + +option1： +1. 确保已经把本目录下config内容复制到 /var/snap/microk8s/common/mnt/data/elasticsearch-config + - sudo mkdir /var/snap/microk8s/common/mnt/data/elasticsearch-data -p || true + - sudo mkdir /var/snap/microk8s/common/mnt/data/elasticsearch-config -p || true +2. ekf空间下资源部署，本目录下所有未被禁用的yaml + - chmod 777 /var/snap/microk8s/common/mnt/data/elasticsearch-config && chmod 777 /var/snap/microk8s/common/mnt/data/elasticsearch-data + - cp config/* /var/snap/microk8s/common/mnt/data/elasticsearch-config -r + - 先装elasticsearch相关 + - 执行./createSecure_passwd.sh + 此时建议停下来看看elasticsearch的pod的状态是否正常，否则后面的步骤没有意义: microk8s.kubectl get all -n efk + - 再装fluentd相关 + - 执行 ./createFluentdAccoutnIn.sh + - 最后装kibana相关 + +-------- + +option2: + +1. 所有yaml都apply完了再 执行这个 + +``` +./createSecure_passwd.sh +``` + +创建了 +账号：elastic +密码：your_secure_password + +2. 然后创建服务账号给kibana, 并重新部署 + +``` +./refreshTokenForKibana.sh +``` +3. 确保已经把最新的traefik的loadbalance的ip配置到/etc/nginx/nginx.conf 的upstreeam里 +-------------- +上述option 二选一 +不管怎么样，最后： 浏览：http://kibana.k8s.xunlang.home + +在kibana的dev tool中执行： + +``` +PUT _index_template/logstash_template +{ + "index_patterns": ["logstash-*"], + "template": { + "settings": { + "number_of_replicas": 0 + } + } +} +``` + +如果已经fluentd已经开始上报log，需删掉已有index: + +``` +DELETE _template/logstash_template +DELETE /logstash-2024.11.09 + +``` diff --git a/efk/backUpElasticSearch.sh b/backUpElasticSearch.sh similarity index 100% rename from efk/backUpElasticSearch.sh rename to backUpElasticSearch.sh diff --git a/backUpEs.sh b/backUpEs.sh deleted file mode 100755 index 169cdd5..0000000 --- a/backUpEs.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# 定义目录和备份文件路径 -SOURCE_DIR="/var/snap/microk8s/common/mnt/data/elasticsearch-data" -BACKUP_DIR="/home/ubuntu/data/tmp/backUp" -BACKUP_FILE="$BACKUP_DIR/backup-$(date '+%Y-%m-%d_%H-%M-%S').tar.gz" - -# 创建备份目录（如果不存在） -mkdir -p "$BACKUP_DIR" - -# 创建备份（保留elasticsearch-data目录结构） -echo "正在备份 $SOURCE_DIR 到 $BACKUP_FILE" -tar -czf "$BACKUP_FILE" -C "$(dirname "$SOURCE_DIR")" "$(basename "$SOURCE_DIR")" - -# 检查备份是否成功 -if [ $? -eq 0 ]; then - echo "备份成功: $BACKUP_FILE" -else - echo "备份失败" - exit 1 -fi - -# 保留最新的 8 个备 - diff --git a/busybox_default.yaml b/busybox_default.yaml deleted file mode 100644 index 6b8faff..0000000 --- a/busybox_default.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ubuntu-deployment - namespace: default - labels: - app: ubuntu -spec: - replicas: 1 - selector: - matchLabels: - app: ubuntu - template: - metadata: - labels: - app: ubuntu - spec: - containers: - - name: ubuntu - image: ubuntu:latest - command: ["sh", "-c", "while true; do echo Hello Kubernetes!; sleep 3600; done"] - diff --git a/efk/config/elasticsearch-plugins.example.yml b/config/elasticsearch-plugins.example.yml similarity index 100% rename from efk/config/elasticsearch-plugins.example.yml rename to config/elasticsearch-plugins.example.yml diff --git a/efk/config/elasticsearch.keystore b/config/elasticsearch.keystore similarity index 100% rename from efk/config/elasticsearch.keystore rename to config/elasticsearch.keystore diff --git a/efk/config/elasticsearch.yml b/config/elasticsearch.yml similarity index 100% rename from efk/config/elasticsearch.yml rename to config/elasticsearch.yml diff --git a/efk/config/jvm.options b/config/jvm.options similarity index 100% rename from efk/config/jvm.options rename to config/jvm.options diff --git a/efk/config/log4j2.file.properties b/config/log4j2.file.properties similarity index 100% rename from efk/config/log4j2.file.properties rename to config/log4j2.file.properties diff --git a/efk/config/log4j2.properties b/config/log4j2.properties similarity index 100% rename from efk/config/log4j2.properties rename to config/log4j2.properties diff --git a/efk/config/role_mapping.yml b/config/role_mapping.yml similarity index 100% rename from efk/config/role_mapping.yml rename to config/role_mapping.yml diff --git a/efk/config/roles.yml b/config/roles.yml similarity index 100% rename from efk/config/roles.yml rename to config/roles.yml diff --git a/efk/config/service_tokens b/config/service_tokens similarity index 100% rename from efk/config/service_tokens rename to config/service_tokens diff --git a/efk/config/users b/config/users similarity index 100% rename from efk/config/users rename to config/users diff --git a/efk/config/users_roles b/config/users_roles similarity index 100% rename from efk/config/users_roles rename to config/users_roles diff --git a/efk/createFluentdAccoutnIn.sh b/createFluentdAccoutnIn.sh similarity index 100% rename from efk/createFluentdAccoutnIn.sh rename to createFluentdAccoutnIn.sh diff --git a/efk/createSecure_passwd_forES.sh b/createSecure_passwd_forES.sh similarity index 100% rename from efk/createSecure_passwd_forES.sh rename to createSecure_passwd_forES.sh diff --git a/dockerFiles/vnc/start-vnc.sh b/dockerFiles/vnc/start-vnc.sh deleted file mode 100644 index 74e06b7..0000000 --- a/dockerFiles/vnc/start-vnc.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# 更新包列表并升级系统 -apt-get update && apt-get upgrade -y - -# 设置 VNC 密码 -if [ -z "$VNC_PASSWORD" ]; then - echo "Error: VNC_PASSWORD is not set" - exit 1 -fi - -mkdir -p ~/.vnc -echo "$VNC_PASSWORD" | vncpasswd -f > ~/.vnc/passwd -chmod 600 ~/.vnc/passwd - -# 设置环境变量 -export USER=root -export DISPLAY=:1 - -# 启动 XFCE 桌面环境和 VNC 服务器 -unset SESSION_MANAGER -unset DBUS_SESSION_BUS_ADDRESS -xrdb $HOME/.Xresources -startxfce4 & -vncserver :1 -geometry 1280x800 -depth 24 -# 启动 x11vnc 以支持剪切板 -x11vnc -display :1 -N -forever -shared & - -# 确保 VNC 服务器日志目录存在 -mkdir -p /root/.vnc - -# 保持容器运行 -tail -F /root/.vnc/*.log - diff --git a/dockerFiles/vnc/vnc.dockerfile b/dockerFiles/vnc/vnc.dockerfile deleted file mode 100644 index 713c9cf..0000000 --- a/dockerFiles/vnc/vnc.dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -# 基础镜像，使用 Ubuntu 并指定 ARM64 架构 -FROM ubuntu:20.04 - -# 设置环境变量，避免交互式提示 -ENV DEBIAN_FRONTEND=noninteractive - -# 更新系统并安装必要的软件 -RUN apt-get update && apt-get install -y \ - xfce4 \ - xfce4-goodies \ - tightvncserver \ - dbus-x11 \ - x11-xserver-utils \ - xvfb \ - xterm \ - wget \ - firefox \ - chromium-browser \ - vim \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -# 设置 VNC 服务启动脚本 -COPY start-vnc.sh /usr/local/bin/start-vnc.sh -RUN chmod +x /usr/local/bin/start-vnc.sh - -# 设置容器启动时的命令 -CMD ["/usr/local/bin/start-vnc.sh"] - -# 暴露 VNC 端口 -EXPOSE 5901 - diff --git a/efk/efk-namespace.yaml b/efk-namespace.yaml similarity index 100% rename from efk/efk-namespace.yaml rename to efk-namespace.yaml diff --git a/efk/README.md b/efk/README.md deleted file mode 100644 index f19dca0..0000000 --- a/efk/README.md +++ /dev/null @@ -1,73 +0,0 @@ -## 如何重新创建整个namespace - -``` -./init.sh -``` -``` -``` - -下面都都不用看了, 直接执行上面的语句 - -先删了 namespace efk，这样里面资源就都没了，除了pv -然后 microk8s.kubectl create namespace efk - - -option1： -1. 确保已经把本目录下config内容复制到 /var/snap/microk8s/common/mnt/data/elasticsearch-config - - sudo mkdir /var/snap/microk8s/common/mnt/data/elasticsearch-data -p || true - - sudo mkdir /var/snap/microk8s/common/mnt/data/elasticsearch-config -p || true -2. ekf空间下资源部署，本目录下所有未被禁用的yaml - - chmod 777 /var/snap/microk8s/common/mnt/data/elasticsearch-config && chmod 777 /var/snap/microk8s/common/mnt/data/elasticsearch-data - - cp config/* /var/snap/microk8s/common/mnt/data/elasticsearch-config -r - - 先装elasticsearch相关 - - 执行./createSecure_passwd.sh - 此时建议停下来看看elasticsearch的pod的状态是否正常，否则后面的步骤没有意义: microk8s.kubectl get all -n efk - - 再装fluentd相关 - - 执行 ./createFluentdAccoutnIn.sh - - 最后装kibana相关 - --------- - -option2: - -1. 所有yaml都apply完了再 执行这个 - -``` -./createSecure_passwd.sh -``` - -创建了 -账号：elastic -密码：your_secure_password - -2. 然后创建服务账号给kibana, 并重新部署 - -``` -./refreshTokenForKibana.sh -``` -3. 确保已经把最新的traefik的loadbalance的ip配置到/etc/nginx/nginx.conf 的upstreeam里 --------------- -上述option 二选一 -不管怎么样，最后： 浏览：http://kibana.k8s.xunlang.home - -在kibana的dev tool中执行： - -``` -PUT _index_template/logstash_template -{ - "index_patterns": ["logstash-*"], - "template": { - "settings": { - "number_of_replicas": 0 - } - } -} -``` - -如果已经fluentd已经开始上报log，需删掉已有index: - -``` -DELETE _template/logstash_template -DELETE /logstash-2024.11.09 - -``` diff --git a/efk/_git/COMMIT_EDITMSG b/efk/_git/COMMIT_EDITMSG deleted file mode 100644 index 3b387a9..0000000 --- a/efk/_git/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -update README diff --git a/efk/_git/HEAD b/efk/_git/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/efk/_git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/efk/_git/ORIG_HEAD b/efk/_git/ORIG_HEAD deleted file mode 100644 index 550c42d..0000000 --- a/efk/_git/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -a829769ed1d706a7def1e750b9621cc14bf669ff diff --git a/efk/_git/config b/efk/_git/config deleted file mode 100644 index b225b5c..0000000 --- a/efk/_git/config +++ /dev/null @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = baidu:repos/k8s/efk - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/efk/_git/description b/efk/_git/description deleted file mode 100644 index 498b267..0000000 --- a/efk/_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/efk/_git/hooks/applypatch-msg.sample b/efk/_git/hooks/applypatch-msg.sample deleted file mode 100755 index a5d7b84..0000000 --- a/efk/_git/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/efk/_git/hooks/commit-msg.sample b/efk/_git/hooks/commit-msg.sample deleted file mode 100755 index b58d118..0000000 --- a/efk/_git/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/efk/_git/hooks/fsmonitor-watchman.sample b/efk/_git/hooks/fsmonitor-watchman.sample deleted file mode 100755 index 14ed0aa..0000000 --- a/efk/_git/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; - -# Check the hook interface version -if ($version ne 2) { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree = get_working_dir(); - -my $retry = 1; - -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - -launch_watchman(); - -sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $last_update_token, - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] - }] - END - - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; }; - - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - return $json_pkg->new->utf8->decode($response); -} - -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { - $retry--; - my $response = qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - - eval { launch_watchman() }; - return 0; - } - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} - -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; -} diff --git a/efk/_git/hooks/post-update.sample b/efk/_git/hooks/post-update.sample deleted file mode 100755 index ec17ec1..0000000 --- a/efk/_git/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/efk/_git/hooks/pre-applypatch.sample b/efk/_git/hooks/pre-applypatch.sample deleted file mode 100755 index 4142082..0000000 --- a/efk/_git/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/efk/_git/hooks/pre-commit.sample b/efk/_git/hooks/pre-commit.sample deleted file mode 100755 index e144712..0000000 --- a/efk/_git/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/efk/_git/hooks/pre-merge-commit.sample b/efk/_git/hooks/pre-merge-commit.sample deleted file mode 100755 index 399eab1..0000000 --- a/efk/_git/hooks/pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git merge" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message to -# stderr if it wants to stop the merge commit. -# -# To enable this hook, rename this file to "pre-merge-commit". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" -: diff --git a/efk/_git/hooks/pre-push.sample b/efk/_git/hooks/pre-push.sample deleted file mode 100755 index 4ce688d..0000000 --- a/efk/_git/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/efk/_git/hooks/pre-rebase.sample b/efk/_git/hooks/pre-rebase.sample deleted file mode 100755 index 6cbef5c..0000000 --- a/efk/_git/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/efk/_git/hooks/pre-receive.sample b/efk/_git/hooks/pre-receive.sample deleted file mode 100755 index a1fd29e..0000000 --- a/efk/_git/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/efk/_git/hooks/prepare-commit-msg.sample b/efk/_git/hooks/prepare-commit-msg.sample deleted file mode 100755 index 10fa14c..0000000 --- a/efk/_git/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/efk/_git/hooks/push-to-checkout.sample b/efk/_git/hooks/push-to-checkout.sample deleted file mode 100755 index af5a0c0..0000000 --- a/efk/_git/hooks/push-to-checkout.sample +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -# An example hook script to update a checked-out tree on a git push. -# -# This hook is invoked by git-receive-pack(1) when it reacts to git -# push and updates reference(s) in its repository, and when the push -# tries to update the branch that is currently checked out and the -# receive.denyCurrentBranch configuration variable is set to -# updateInstead. -# -# By default, such a push is refused if the working tree and the index -# of the remote repository has any difference from the currently -# checked out commit; when both the working tree and the index match -# the current commit, they are updated to match the newly pushed tip -# of the branch. This hook is to be used to override the default -# behaviour; however the code below reimplements the default behaviour -# as a starting point for convenient modification. -# -# The hook receives the commit with which the tip of the current -# branch is going to be updated: -commit=$1 - -# It can exit with a non-zero status to refuse the push (when it does -# so, it must not modify the index or the working tree). -die () { - echo >&2 "$*" - exit 1 -} - -# Or it can make any necessary changes to the working tree and to the -# index to bring them to the desired state when the tip of the current -# branch is updated to the new commit, and exit with a zero status. -# -# For example, the hook can simply run git read-tree -u -m HEAD "$1" -# in order to emulate git fetch that is run in the reverse direction -# with git push, as the two-tree form of git read-tree -u -m is -# essentially the same as git switch or git checkout that switches -# branches while keeping the local changes in the working tree that do -# not interfere with the difference between the branches. - -# The below is a more-or-less exact translation to shell of the C code -# for the default behaviour for git's push-to-checkout hook defined in -# the push_to_deploy() function in builtin/receive-pack.c. -# -# Note that the hook will be executed from the repository directory, -# not from the working tree, so if you want to perform operations on -# the working tree, you will have to adapt your code accordingly, e.g. -# by adding "cd .." or using relative paths. - -if ! git update-index -q --ignore-submodules --refresh -then - die "Up-to-date check failed" -fi - -if ! git diff-files --quiet --ignore-submodules -- -then - die "Working directory has unstaged changes" -fi - -# This is a rough translation of: -# -# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX -if git cat-file -e HEAD 2>/dev/null -then - head=HEAD -else - head=$(git hash-object -t tree --stdin &2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero=$(git hash-object --stdin &2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/efk/_git/index b/efk/_git/index deleted file mode 100644 index 25fa622..0000000 Binary files a/efk/_git/index and /dev/null differ diff --git a/efk/_git/info/exclude b/efk/_git/info/exclude deleted file mode 100644 index a5196d1..0000000 --- a/efk/_git/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/efk/_git/logs/HEAD b/efk/_git/logs/HEAD deleted file mode 100644 index d5eb6af..0000000 --- a/efk/_git/logs/HEAD +++ /dev/null @@ -1,11 +0,0 @@ -0000000000000000000000000000000000000000 5ab8067b9f81af0270a90c12bcfcc7f071d685dd zhangkun 1727151229 +0800 commit (initial): fluentd almost done -5ab8067b9f81af0270a90c12bcfcc7f071d685dd 6e2d38a87357e2767c21dc7e2d482ac46eef6d42 zhangkun 1727151284 +0800 commit: remove tar -6e2d38a87357e2767c21dc7e2d482ac46eef6d42 3fe1c4b81d79fc517c95dc32299bfa67841e58a4 zhangkun 1734359708 +0800 commit: up -3fe1c4b81d79fc517c95dc32299bfa67841e58a4 0dab4baba98695bc8ffbce60283bb5d7111290c6 zhangkun 1734855389 +0800 commit: fluentd设置为东8区 -0dab4baba98695bc8ffbce60283bb5d7111290c6 d895728b90c5cd39f496bc80f8089c2728de8720 zhangkun 1734918087 +0800 commit: fluentd强制使用东八区 -d895728b90c5cd39f496bc80f8089c2728de8720 32f2a58edd56f35d6d2689b8cab7cc347b12bddf zhangkun 1734925200 +0800 commit: hash散列进行日志分组，不再使用日期分组 -32f2a58edd56f35d6d2689b8cab7cc347b12bddf 72ec36fc335eb7fc761df63f3231aecb4b1048d1 zhangkun 1734944524 +0800 commit: fluentd 改成 1秒钟一刷新，防止堆砌请求不发 -72ec36fc335eb7fc761df63f3231aecb4b1048d1 a829769ed1d706a7def1e750b9621cc14bf669ff phyer 1735051930 +0800 commit: fluentd恢复到以日为单位index -a829769ed1d706a7def1e750b9621cc14bf669ff a829769ed1d706a7def1e750b9621cc14bf669ff phyer 1735093625 +0800 reset: moving to HEAD -a829769ed1d706a7def1e750b9621cc14bf669ff 6e401b3546099e5e9a231979ec967b5d2f92c844 phyer 1735093967 +0800 commit: fluentd works fine with es -6e401b3546099e5e9a231979ec967b5d2f92c844 1a146cad3fb1f6d08e44e811c747b658b62fb85e phyer 1735263819 +0800 commit: update README diff --git a/efk/_git/logs/refs/heads/master b/efk/_git/logs/refs/heads/master deleted file mode 100644 index 98cac9a..0000000 --- a/efk/_git/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 5ab8067b9f81af0270a90c12bcfcc7f071d685dd zhangkun 1727151229 +0800 commit (initial): fluentd almost done -5ab8067b9f81af0270a90c12bcfcc7f071d685dd 6e2d38a87357e2767c21dc7e2d482ac46eef6d42 zhangkun 1727151284 +0800 commit: remove tar -6e2d38a87357e2767c21dc7e2d482ac46eef6d42 3fe1c4b81d79fc517c95dc32299bfa67841e58a4 zhangkun 1734359708 +0800 commit: up -3fe1c4b81d79fc517c95dc32299bfa67841e58a4 0dab4baba98695bc8ffbce60283bb5d7111290c6 zhangkun 1734855389 +0800 commit: fluentd设置为东8区 -0dab4baba98695bc8ffbce60283bb5d7111290c6 d895728b90c5cd39f496bc80f8089c2728de8720 zhangkun 1734918087 +0800 commit: fluentd强制使用东八区 -d895728b90c5cd39f496bc80f8089c2728de8720 32f2a58edd56f35d6d2689b8cab7cc347b12bddf zhangkun 1734925200 +0800 commit: hash散列进行日志分组，不再使用日期分组 -32f2a58edd56f35d6d2689b8cab7cc347b12bddf 72ec36fc335eb7fc761df63f3231aecb4b1048d1 zhangkun 1734944524 +0800 commit: fluentd 改成 1秒钟一刷新，防止堆砌请求不发 -72ec36fc335eb7fc761df63f3231aecb4b1048d1 a829769ed1d706a7def1e750b9621cc14bf669ff phyer 1735051930 +0800 commit: fluentd恢复到以日为单位index -a829769ed1d706a7def1e750b9621cc14bf669ff 6e401b3546099e5e9a231979ec967b5d2f92c844 phyer 1735093967 +0800 commit: fluentd works fine with es -6e401b3546099e5e9a231979ec967b5d2f92c844 1a146cad3fb1f6d08e44e811c747b658b62fb85e phyer 1735263819 +0800 commit: update README diff --git a/efk/_git/logs/refs/remotes/origin/master b/efk/_git/logs/refs/remotes/origin/master deleted file mode 100644 index 07d69ef..0000000 --- a/efk/_git/logs/refs/remotes/origin/master +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 6e2d38a87357e2767c21dc7e2d482ac46eef6d42 zhangkun 1727151307 +0800 update by push -6e2d38a87357e2767c21dc7e2d482ac46eef6d42 3fe1c4b81d79fc517c95dc32299bfa67841e58a4 zhangkun 1734359709 +0800 update by push -3fe1c4b81d79fc517c95dc32299bfa67841e58a4 0dab4baba98695bc8ffbce60283bb5d7111290c6 zhangkun 1734855389 +0800 update by push -0dab4baba98695bc8ffbce60283bb5d7111290c6 d895728b90c5cd39f496bc80f8089c2728de8720 zhangkun 1734918087 +0800 update by push -d895728b90c5cd39f496bc80f8089c2728de8720 32f2a58edd56f35d6d2689b8cab7cc347b12bddf zhangkun 1734925202 +0800 update by push -32f2a58edd56f35d6d2689b8cab7cc347b12bddf 72ec36fc335eb7fc761df63f3231aecb4b1048d1 zhangkun 1734944525 +0800 update by push -72ec36fc335eb7fc761df63f3231aecb4b1048d1 a829769ed1d706a7def1e750b9621cc14bf669ff phyer 1735051931 +0800 update by push -a829769ed1d706a7def1e750b9621cc14bf669ff 6e401b3546099e5e9a231979ec967b5d2f92c844 phyer 1735093968 +0800 update by push -6e401b3546099e5e9a231979ec967b5d2f92c844 1a146cad3fb1f6d08e44e811c747b658b62fb85e phyer 1735263819 +0800 update by push diff --git a/efk/_git/objects/02/26110dde255c6ffc43198f84d4a40707dfa731 b/efk/_git/objects/02/26110dde255c6ffc43198f84d4a40707dfa731 deleted file mode 100644 index 1d42f84..0000000 Binary files a/efk/_git/objects/02/26110dde255c6ffc43198f84d4a40707dfa731 and /dev/null differ diff --git a/efk/_git/objects/06/006ecfc4f47b4f5646b223e8b496eaba139de9 b/efk/_git/objects/06/006ecfc4f47b4f5646b223e8b496eaba139de9 deleted file mode 100644 index c1500b4..0000000 --- a/efk/_git/objects/06/006ecfc4f47b4f5646b223e8b496eaba139de9 +++ /dev/null @@ -1,2 +0,0 @@ -xU0 DViCł7ʂƐmR%OyNv-4氡_9e¼W?/4, 42B[ -늢~lM8 | s9U.fAЦ* ⁲.3##ܴ(cԶp8Nοy%brC \ No newline at end of file diff --git a/efk/_git/objects/08/2ca72b26e5f03b39cfbc723a0a382bf7ac0c24 b/efk/_git/objects/08/2ca72b26e5f03b39cfbc723a0a382bf7ac0c24 deleted file mode 100644 index 857e2ff..0000000 Binary files a/efk/_git/objects/08/2ca72b26e5f03b39cfbc723a0a382bf7ac0c24 and /dev/null differ diff --git a/efk/_git/objects/0d/ab4baba98695bc8ffbce60283bb5d7111290c6 b/efk/_git/objects/0d/ab4baba98695bc8ffbce60283bb5d7111290c6 deleted file mode 100644 index 7226f4b..0000000 Binary files a/efk/_git/objects/0d/ab4baba98695bc8ffbce60283bb5d7111290c6 and /dev/null differ diff --git a/efk/_git/objects/14/8e119ea3e465654425462f676813feb488274e b/efk/_git/objects/14/8e119ea3e465654425462f676813feb488274e deleted file mode 100644 index 8a6259d..0000000 Binary files a/efk/_git/objects/14/8e119ea3e465654425462f676813feb488274e and /dev/null differ diff --git a/efk/_git/objects/16/2ffba9f7f394d9096e247dc8019aa34d0fb50d b/efk/_git/objects/16/2ffba9f7f394d9096e247dc8019aa34d0fb50d deleted file mode 100644 index b71c4b4..0000000 Binary files a/efk/_git/objects/16/2ffba9f7f394d9096e247dc8019aa34d0fb50d and /dev/null differ diff --git a/efk/_git/objects/17/84319c10616bd78f08424ac592f7f9e808035b b/efk/_git/objects/17/84319c10616bd78f08424ac592f7f9e808035b deleted file mode 100644 index 993b0ce..0000000 Binary files a/efk/_git/objects/17/84319c10616bd78f08424ac592f7f9e808035b and /dev/null differ diff --git a/efk/_git/objects/1a/146cad3fb1f6d08e44e811c747b658b62fb85e b/efk/_git/objects/1a/146cad3fb1f6d08e44e811c747b658b62fb85e deleted file mode 100644 index e150fa5..0000000 --- a/efk/_git/objects/1a/146cad3fb1f6d08e44e811c747b658b62fb85e +++ /dev/null @@ -1,2 +0,0 @@ -x= -1Fs$L,k?l]<e^M;h$1q {5kX*sA=HP(;IB챸'UڸT5/E$Kh1jj[Kn> \ No newline at end of file diff --git a/efk/_git/objects/1e/248cb28bfcf76da1b673e8a86dde4f36fc8ed4 b/efk/_git/objects/1e/248cb28bfcf76da1b673e8a86dde4f36fc8ed4 deleted file mode 100644 index 5e63996..0000000 Binary files a/efk/_git/objects/1e/248cb28bfcf76da1b673e8a86dde4f36fc8ed4 and /dev/null differ diff --git a/efk/_git/objects/24/9b7c4d501705786d1da2a66962be16eb8501ce b/efk/_git/objects/24/9b7c4d501705786d1da2a66962be16eb8501ce deleted file mode 100644 index e4d878c..0000000 Binary files a/efk/_git/objects/24/9b7c4d501705786d1da2a66962be16eb8501ce and /dev/null differ diff --git a/efk/_git/objects/24/ff26fd41346ec13c111476fe04edea71b25986 b/efk/_git/objects/24/ff26fd41346ec13c111476fe04edea71b25986 deleted file mode 100644 index b4fb867..0000000 --- a/efk/_git/objects/24/ff26fd41346ec13c111476fe04edea71b25986 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0D=+P={d6Yп7o3o3e$wZI-iufJ9zs]S`"B Qž4"[ t4[R=O4W"E}gZA_7ׂx7c8" \ No newline at end of file diff --git a/efk/_git/objects/2b/dba40924cf6a146385204a07cc44f78bb57f3b b/efk/_git/objects/2b/dba40924cf6a146385204a07cc44f78bb57f3b deleted file mode 100644 index fc1a860..0000000 Binary files a/efk/_git/objects/2b/dba40924cf6a146385204a07cc44f78bb57f3b and /dev/null differ diff --git a/efk/_git/objects/2f/30e89cd818accfadc9a3a54e4234a5027555e7 b/efk/_git/objects/2f/30e89cd818accfadc9a3a54e4234a5027555e7 deleted file mode 100644 index ebe84d5..0000000 Binary files a/efk/_git/objects/2f/30e89cd818accfadc9a3a54e4234a5027555e7 and /dev/null differ diff --git a/efk/_git/objects/31/a1de8d8dc287c4581ab226e973a8d1248cede9 b/efk/_git/objects/31/a1de8d8dc287c4581ab226e973a8d1248cede9 deleted file mode 100644 index 59fc82f..0000000 Binary files a/efk/_git/objects/31/a1de8d8dc287c4581ab226e973a8d1248cede9 and /dev/null differ diff --git a/efk/_git/objects/31/c0af479f9950482931ee415ebd2ac6173b5ccb b/efk/_git/objects/31/c0af479f9950482931ee415ebd2ac6173b5ccb deleted file mode 100644 index 6202c0e..0000000 --- a/efk/_git/objects/31/c0af479f9950482931ee415ebd2ac6173b5ccb +++ /dev/null @@ -1,3 +0,0 @@ -xMkQ]ϯ8f]̌"D;TbEpg瓹Wc]i"~b%ɝIb6y1Ή55в 0=6K(M$2;'/7a55o]A_+,96Y@ (.0,Nj*<V.5f2bFTx) h(n r3Ϸ>A1xg/~/>!A_'hJ:( -b`V(FmL.2i(q>V Ui '0txӽv .޻z&zWO0-Š5>?`9I~w?3|57&(jRVhrV疘•͑·77RR~JZߧygOW׭>KZ Ag \ No newline at end of file diff --git a/efk/_git/objects/32/f2a58edd56f35d6d2689b8cab7cc347b12bddf b/efk/_git/objects/32/f2a58edd56f35d6d2689b8cab7cc347b12bddf deleted file mode 100644 index eb543e7..0000000 Binary files a/efk/_git/objects/32/f2a58edd56f35d6d2689b8cab7cc347b12bddf and /dev/null differ diff --git a/efk/_git/objects/34/fd91d9f157c5281ee844d0a0306c7284cb9764 b/efk/_git/objects/34/fd91d9f157c5281ee844d0a0306c7284cb9764 deleted file mode 100644 index 8afa5f1..0000000 Binary files a/efk/_git/objects/34/fd91d9f157c5281ee844d0a0306c7284cb9764 and /dev/null differ diff --git a/efk/_git/objects/39/161d1a6c2d395061d45a1d66f0c141a5cbe423 b/efk/_git/objects/39/161d1a6c2d395061d45a1d66f0c141a5cbe423 deleted file mode 100644 index 32ebdac..0000000 Binary files a/efk/_git/objects/39/161d1a6c2d395061d45a1d66f0c141a5cbe423 and /dev/null differ diff --git a/efk/_git/objects/3b/f9821d6441c0a9785cd45b9972cf1d65707d4f b/efk/_git/objects/3b/f9821d6441c0a9785cd45b9972cf1d65707d4f deleted file mode 100644 index 345be75..0000000 Binary files a/efk/_git/objects/3b/f9821d6441c0a9785cd45b9972cf1d65707d4f and /dev/null differ diff --git a/efk/_git/objects/3c/74311865061a6fa0ec256773eac72236acd496 b/efk/_git/objects/3c/74311865061a6fa0ec256773eac72236acd496 deleted file mode 100644 index 50596a0..0000000 Binary files a/efk/_git/objects/3c/74311865061a6fa0ec256773eac72236acd496 and /dev/null differ diff --git a/efk/_git/objects/3f/e1c4b81d79fc517c95dc32299bfa67841e58a4 b/efk/_git/objects/3f/e1c4b81d79fc517c95dc32299bfa67841e58a4 deleted file mode 100644 index 73b8a1d..0000000 Binary files a/efk/_git/objects/3f/e1c4b81d79fc517c95dc32299bfa67841e58a4 and /dev/null differ diff --git a/efk/_git/objects/47/74604e47751b7807fb1d3d19d322926036f970 b/efk/_git/objects/47/74604e47751b7807fb1d3d19d322926036f970 deleted file mode 100644 index baaa46e..0000000 Binary files a/efk/_git/objects/47/74604e47751b7807fb1d3d19d322926036f970 and /dev/null differ diff --git a/efk/_git/objects/50/b154702b9419377321d231c4a476eab3a60e07 b/efk/_git/objects/50/b154702b9419377321d231c4a476eab3a60e07 deleted file mode 100644 index 8c061bf..0000000 Binary files a/efk/_git/objects/50/b154702b9419377321d231c4a476eab3a60e07 and /dev/null differ diff --git a/efk/_git/objects/53/bd39da507497d3674d64f86f3b27d3aa2ca648 b/efk/_git/objects/53/bd39da507497d3674d64f86f3b27d3aa2ca648 deleted file mode 100644 index 99e3504..0000000 --- a/efk/_git/objects/53/bd39da507497d3674d64f86f3b27d3aa2ca648 +++ /dev/null @@ -1,3 +0,0 @@ -xeO0 SD&`-mYoHknvMM6 /gqr3w 6XY-GZk G9Z?,1S -sWU^J=܆e#˅q_ -j#ebbA2ddoh1 \ No newline at end of file diff --git a/efk/_git/objects/54/37f614d580c4c1cde3949366dceca6ef62f361 b/efk/_git/objects/54/37f614d580c4c1cde3949366dceca6ef62f361 deleted file mode 100644 index c2b65fe..0000000 --- a/efk/_git/objects/54/37f614d580c4c1cde3949366dceca6ef62f361 +++ /dev/null @@ -1,2 +0,0 @@ -xuQn0 %@KStZHt,Dn_!mIwOh'9L.FfnR?&51Jdkʠ-5,Eޢ$^2 <ܛ :#_-AlcAIPmq F<:J9V'pQ5})awy,XDn8۞ NT;rw#Je<#?eizQQۣb.EuX890=Ҹ kl"%O+]JNGzoa voLM!ƴBoP/P; -'V \ No newline at end of file diff --git a/efk/_git/objects/57/9f79191ecd0b484aae1c868f42b607d01934d3 b/efk/_git/objects/57/9f79191ecd0b484aae1c868f42b607d01934d3 deleted file mode 100644 index 440155c..0000000 Binary files a/efk/_git/objects/57/9f79191ecd0b484aae1c868f42b607d01934d3 and /dev/null differ diff --git a/efk/_git/objects/59/434558ba2ca4acd35c457dc610e3fe011c3631 b/efk/_git/objects/59/434558ba2ca4acd35c457dc610e3fe011c3631 deleted file mode 100644 index e75dcd2..0000000 Binary files a/efk/_git/objects/59/434558ba2ca4acd35c457dc610e3fe011c3631 and /dev/null differ diff --git a/efk/_git/objects/5a/b8067b9f81af0270a90c12bcfcc7f071d685dd b/efk/_git/objects/5a/b8067b9f81af0270a90c12bcfcc7f071d685dd deleted file mode 100644 index 4052655..0000000 --- a/efk/_git/objects/5a/b8067b9f81af0270a90c12bcfcc7f071d685dd +++ /dev/null @@ -1,2 +0,0 @@ -x= -1@abz I@0&uDB"J2tk .y_j?ihP"3 \ No newline at end of file diff --git a/efk/_git/objects/5a/ee016ffce5821abd2e85a2181644003b8b086f b/efk/_git/objects/5a/ee016ffce5821abd2e85a2181644003b8b086f deleted file mode 100644 index 85da11e..0000000 --- a/efk/_git/objects/5a/ee016ffce5821abd2e85a2181644003b8b086f +++ /dev/null @@ -1,2 +0,0 @@ -xAk@=xՀbԓBsM&qfwɮXQ{#К7ի0_\u \ No newline at end of file diff --git a/efk/_git/objects/5b/b63ce18966acd771ae1100ad3840b087e86c11 b/efk/_git/objects/5b/b63ce18966acd771ae1100ad3840b087e86c11 deleted file mode 100644 index 825aeff..0000000 Binary files a/efk/_git/objects/5b/b63ce18966acd771ae1100ad3840b087e86c11 and /dev/null differ diff --git a/efk/_git/objects/5c/4dd98964594e7e48d09a6e3c4c02859e982ecd b/efk/_git/objects/5c/4dd98964594e7e48d09a6e3c4c02859e982ecd deleted file mode 100644 index 58f1d1e..0000000 Binary files a/efk/_git/objects/5c/4dd98964594e7e48d09a6e3c4c02859e982ecd and /dev/null differ diff --git a/efk/_git/objects/5e/0e9ca55b8c8983c3c428a71465f21587185c38 b/efk/_git/objects/5e/0e9ca55b8c8983c3c428a71465f21587185c38 deleted file mode 100644 index 3bf193e..0000000 Binary files a/efk/_git/objects/5e/0e9ca55b8c8983c3c428a71465f21587185c38 and /dev/null differ diff --git a/efk/_git/objects/5f/8fd5eac7095357f18cccfa62ab79059b9afb5a b/efk/_git/objects/5f/8fd5eac7095357f18cccfa62ab79059b9afb5a deleted file mode 100644 index ba39669..0000000 --- a/efk/_git/objects/5f/8fd5eac7095357f18cccfa62ab79059b9afb5a +++ /dev/null @@ -1,2 +0,0 @@ -x] -0 =)ruCPkx¶$E}{;0_ϣӮUHo1I3 19W;`M֏XS~Aq[;fQqGH2#X_FᰦMmpLMȮ"dChvM([9mՂVq/,lUju \ No newline at end of file diff --git a/efk/_git/objects/62/b6e0e63492a7362a69bc0b9fef5871acc5721b b/efk/_git/objects/62/b6e0e63492a7362a69bc0b9fef5871acc5721b deleted file mode 100644 index 296787a..0000000 Binary files a/efk/_git/objects/62/b6e0e63492a7362a69bc0b9fef5871acc5721b and /dev/null differ diff --git a/efk/_git/objects/64/818921420de580c202c0a127708a4c6a0898b4 b/efk/_git/objects/64/818921420de580c202c0a127708a4c6a0898b4 deleted file mode 100644 index 4d5744d..0000000 Binary files a/efk/_git/objects/64/818921420de580c202c0a127708a4c6a0898b4 and /dev/null differ diff --git a/efk/_git/objects/68/c82f7e7c05b02e9aa539262ffa2df332cd078e b/efk/_git/objects/68/c82f7e7c05b02e9aa539262ffa2df332cd078e deleted file mode 100644 index 69d73d5..0000000 --- a/efk/_git/objects/68/c82f7e7c05b02e9aa539262ffa2df332cd078e +++ /dev/null @@ -1 +0,0 @@ -xj1SS . W)R;HZ}V>Lr!Bftr|+;W10AsT*F+OgcQT.VgRI6I|~(FAap pDR5bSЀ<b3䨰&!̜r~cySzk݌YW!Qjl㲰}֗Mi-,ӵ"5 \ No newline at end of file diff --git a/efk/_git/objects/68/e003b8cdedd9b83a63565a4ab01bd5378d5a73 b/efk/_git/objects/68/e003b8cdedd9b83a63565a4ab01bd5378d5a73 deleted file mode 100644 index bdcdf86..0000000 --- a/efk/_git/objects/68/e003b8cdedd9b83a63565a4ab01bd5378d5a73 +++ /dev/null @@ -1,2 +0,0 @@ -xU10DQbAT)`MJ7Z۠hqAmb 쩄 ^Cx^ -Ju{63IߘDIjں5-1k.[Q@(} UCzp$MxM7_kgZ51I7=5 \ No newline at end of file diff --git a/efk/_git/objects/6e/401b3546099e5e9a231979ec967b5d2f92c844 b/efk/_git/objects/6e/401b3546099e5e9a231979ec967b5d2f92c844 deleted file mode 100644 index 89832de..0000000 --- a/efk/_git/objects/6e/401b3546099e5e9a231979ec967b5d2f92c844 +++ /dev/null @@ -1,2 +0,0 @@ -x[ - E*PԨR3$y` tpNZy` ]jan9t$}Dh4QcvXx{KɨCb(Xq@"*u\ l ܧ%:?`5uZ5ںjk(y(ù2- TG]}Ej \ No newline at end of file diff --git a/efk/_git/objects/72/a98f54138e9cb90ca6d02cc2b54ebda3233f41 b/efk/_git/objects/72/a98f54138e9cb90ca6d02cc2b54ebda3233f41 deleted file mode 100644 index c15e41d..0000000 --- a/efk/_git/objects/72/a98f54138e9cb90ca6d02cc2b54ebda3233f41 +++ /dev/null @@ -1,2 +0,0 @@ -xUM -0){SJхB8mHfM.=~\`q/삷zt=x0cÆ&`qh0\JVwD$0UZ{ؕ 20gہmLu7Ur0^% ⷥw"pԑΓ2{oMN_ \ No newline at end of file diff --git a/efk/_git/objects/72/ec36fc335eb7fc761df63f3231aecb4b1048d1 b/efk/_git/objects/72/ec36fc335eb7fc761df63f3231aecb4b1048d1 deleted file mode 100644 index e676e8f..0000000 --- a/efk/_git/objects/72/ec36fc335eb7fc761df63f3231aecb4b1048d1 +++ /dev/null @@ -1,2 +0,0 @@ -xοNB1q>YzO.i+Fޅ8Bq8,`p LG,Ju$aT‰#r+ -qB.m#ZeBci*g:M$v:#mm}zpW'Ph!+)Jq9_T -Yh,#On=-fMszϏz_ju7s `e \ No newline at end of file diff --git a/efk/_git/objects/77/4992a80975f8041464330fe1a2ff3e6b76dde7 b/efk/_git/objects/77/4992a80975f8041464330fe1a2ff3e6b76dde7 deleted file mode 100644 index 1d36d9f..0000000 Binary files a/efk/_git/objects/77/4992a80975f8041464330fe1a2ff3e6b76dde7 and /dev/null differ diff --git a/efk/_git/objects/77/70b74377b67eb34d9b0a6d9393004b05f45370 b/efk/_git/objects/77/70b74377b67eb34d9b0a6d9393004b05f45370 deleted file mode 100644 index 83c9a82..0000000 Binary files a/efk/_git/objects/77/70b74377b67eb34d9b0a6d9393004b05f45370 and /dev/null differ diff --git a/efk/_git/objects/7b/1201f49cebbc3f66ad1066ebf9a712ef98c417 b/efk/_git/objects/7b/1201f49cebbc3f66ad1066ebf9a712ef98c417 deleted file mode 100644 index 0fcedad..0000000 --- a/efk/_git/objects/7b/1201f49cebbc3f66ad1066ebf9a712ef98c417 +++ /dev/null @@ -1,3 +0,0 @@ -xeͱ0a>IA !qC': -hZ[BKwIΟ+b !lt?ozI)d)w -94jP)BRRu]1ͬ`( 6x5W-~Iu* \ No newline at end of file diff --git a/efk/_git/objects/9c/7dad304d827d2fc3b0b1c5f6cf01323d8ccda2 b/efk/_git/objects/9c/7dad304d827d2fc3b0b1c5f6cf01323d8ccda2 deleted file mode 100644 index a80fcf4..0000000 Binary files a/efk/_git/objects/9c/7dad304d827d2fc3b0b1c5f6cf01323d8ccda2 and /dev/null differ diff --git a/efk/_git/objects/a5/40c2b59f1bbdd8a5251132d1fe71e52267886d b/efk/_git/objects/a5/40c2b59f1bbdd8a5251132d1fe71e52267886d deleted file mode 100644 index 3bc0464..0000000 Binary files a/efk/_git/objects/a5/40c2b59f1bbdd8a5251132d1fe71e52267886d and /dev/null differ diff --git a/efk/_git/objects/a6/b25727bfc8569b3d15e06755090ff99e433888 b/efk/_git/objects/a6/b25727bfc8569b3d15e06755090ff99e433888 deleted file mode 100644 index 912c6c7..0000000 Binary files a/efk/_git/objects/a6/b25727bfc8569b3d15e06755090ff99e433888 and /dev/null differ diff --git a/efk/_git/objects/a8/29769ed1d706a7def1e750b9621cc14bf669ff b/efk/_git/objects/a8/29769ed1d706a7def1e750b9621cc14bf669ff deleted file mode 100644 index 0f6b13b..0000000 Binary files a/efk/_git/objects/a8/29769ed1d706a7def1e750b9621cc14bf669ff and /dev/null differ diff --git a/efk/_git/objects/a9/9d80c7f41ac091ddf72f57ed7df279726cc7d4 b/efk/_git/objects/a9/9d80c7f41ac091ddf72f57ed7df279726cc7d4 deleted file mode 100644 index e7aa341..0000000 Binary files a/efk/_git/objects/a9/9d80c7f41ac091ddf72f57ed7df279726cc7d4 and /dev/null differ diff --git a/efk/_git/objects/ab/21c3d09c4ef95c83011996e69ac0c63e15f7e0 b/efk/_git/objects/ab/21c3d09c4ef95c83011996e69ac0c63e15f7e0 deleted file mode 100644 index 87e9ed0..0000000 Binary files a/efk/_git/objects/ab/21c3d09c4ef95c83011996e69ac0c63e15f7e0 and /dev/null differ diff --git a/efk/_git/objects/ab/ad64efcfda92e24af88a2300cb9151761ab526 b/efk/_git/objects/ab/ad64efcfda92e24af88a2300cb9151761ab526 deleted file mode 100644 index 63ab4fb..0000000 Binary files a/efk/_git/objects/ab/ad64efcfda92e24af88a2300cb9151761ab526 and /dev/null differ diff --git a/efk/_git/objects/b6/874e915feecf6d779b8950af2991931f59b57d b/efk/_git/objects/b6/874e915feecf6d779b8950af2991931f59b57d deleted file mode 100644 index a72da82..0000000 Binary files a/efk/_git/objects/b6/874e915feecf6d779b8950af2991931f59b57d and /dev/null differ diff --git a/efk/_git/objects/bd/ca028be8249bf77ee84873c18aec28add30aef b/efk/_git/objects/bd/ca028be8249bf77ee84873c18aec28add30aef deleted file mode 100644 index 7e17f42..0000000 Binary files a/efk/_git/objects/bd/ca028be8249bf77ee84873c18aec28add30aef and /dev/null differ diff --git a/efk/_git/objects/bf/a019c84bc156683905e689a26c2cec72f86eb1 b/efk/_git/objects/bf/a019c84bc156683905e689a26c2cec72f86eb1 deleted file mode 100644 index 2248947..0000000 Binary files a/efk/_git/objects/bf/a019c84bc156683905e689a26c2cec72f86eb1 and /dev/null differ diff --git a/efk/_git/objects/c0/d67c8e81403b8a31201ec3ef650775074bb440 b/efk/_git/objects/c0/d67c8e81403b8a31201ec3ef650775074bb440 deleted file mode 100644 index 72bdc98..0000000 Binary files a/efk/_git/objects/c0/d67c8e81403b8a31201ec3ef650775074bb440 and /dev/null differ diff --git a/efk/_git/objects/c1/3e6e0364723145970834e4e3963c388dfc4f54 b/efk/_git/objects/c1/3e6e0364723145970834e4e3963c388dfc4f54 deleted file mode 100644 index 1b170c0..0000000 Binary files a/efk/_git/objects/c1/3e6e0364723145970834e4e3963c388dfc4f54 and /dev/null differ diff --git a/efk/_git/objects/c1/d4da54a9ee5bb3cffa788d2a258ebe979afab6 b/efk/_git/objects/c1/d4da54a9ee5bb3cffa788d2a258ebe979afab6 deleted file mode 100644 index 6365704..0000000 Binary files a/efk/_git/objects/c1/d4da54a9ee5bb3cffa788d2a258ebe979afab6 and /dev/null differ diff --git a/efk/_git/objects/c2/7bfe3fe397a427d6e763825ad940792e07f135 b/efk/_git/objects/c2/7bfe3fe397a427d6e763825ad940792e07f135 deleted file mode 100644 index f6c33d9..0000000 Binary files a/efk/_git/objects/c2/7bfe3fe397a427d6e763825ad940792e07f135 and /dev/null differ diff --git a/efk/_git/objects/cb/d9022a95280468cdb1a9d3dd8a355db1d358f7 b/efk/_git/objects/cb/d9022a95280468cdb1a9d3dd8a355db1d358f7 deleted file mode 100644 index 1af4a63..0000000 --- a/efk/_git/objects/cb/d9022a95280468cdb1a9d3dd8a355db1d358f7 +++ /dev/null @@ -1 +0,0 @@ -x=10C@ EcC,;1{RDtِKq>-QQjR3+ȰJo(VXe+aJtDOZcr|V5ttMO4 \ No newline at end of file diff --git a/efk/_git/objects/cd/d91eb008f1bedde561e99c7918cf56dd17a965 b/efk/_git/objects/cd/d91eb008f1bedde561e99c7918cf56dd17a965 deleted file mode 100644 index e8d4842..0000000 Binary files a/efk/_git/objects/cd/d91eb008f1bedde561e99c7918cf56dd17a965 and /dev/null differ diff --git a/efk/_git/objects/d8/95728b90c5cd39f496bc80f8089c2728de8720 b/efk/_git/objects/d8/95728b90c5cd39f496bc80f8089c2728de8720 deleted file mode 100644 index db5710a..0000000 Binary files a/efk/_git/objects/d8/95728b90c5cd39f496bc80f8089c2728de8720 and /dev/null differ diff --git a/efk/_git/objects/de/fa5502b2f0bd8bec5e5c9f68d0a4c7924150b6 b/efk/_git/objects/de/fa5502b2f0bd8bec5e5c9f68d0a4c7924150b6 deleted file mode 100644 index 467ec75..0000000 Binary files a/efk/_git/objects/de/fa5502b2f0bd8bec5e5c9f68d0a4c7924150b6 and /dev/null differ diff --git a/efk/_git/objects/e2/f71555ad60cbb1606ed56c8a85a5fd28a284ce b/efk/_git/objects/e2/f71555ad60cbb1606ed56c8a85a5fd28a284ce deleted file mode 100644 index 334fcd6..0000000 Binary files a/efk/_git/objects/e2/f71555ad60cbb1606ed56c8a85a5fd28a284ce and /dev/null differ diff --git a/efk/_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/efk/_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 7112238..0000000 Binary files a/efk/_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 and /dev/null differ diff --git a/efk/_git/objects/e6/a3542a05059fda266d892caa0bd85c5f888413 b/efk/_git/objects/e6/a3542a05059fda266d892caa0bd85c5f888413 deleted file mode 100644 index 63e285e..0000000 Binary files a/efk/_git/objects/e6/a3542a05059fda266d892caa0bd85c5f888413 and /dev/null differ diff --git a/efk/_git/objects/f8/76f527711ffeff34ac34e4782e4db9e9c21461 b/efk/_git/objects/f8/76f527711ffeff34ac34e4782e4db9e9c21461 deleted file mode 100644 index 6dd755c..0000000 --- a/efk/_git/objects/f8/76f527711ffeff34ac34e4782e4db9e9c21461 +++ /dev/null @@ -1,2 +0,0 @@ -x_o0̧xoLT] $^qǶlCo?{J*/=>s5k_@ՆI!PΖMFTqRa;- Q!-ЖA4 - ֔߉V(vPUrJԇ,iY*/by%=קHa 7k7_g7F-`,#5. ?)텽omᴨ؟x O'~̊8;w.dVE1I e;c \ѷAvlN,N&uy>.I^qNpuu̅PӴ 6L<:I#<*e?pR i?!dz,/aߨ-p'8Nle6? - @type http - @id input_http - port 8888 - tag sardine.log - - - @type elasticsearch - @id output_elasticsearch - host elasticsearch - port 9200 - scheme http - user fluentd_user - password fluentd_password - index_name logstash-sardine-%Y.%m.%d - diff --git a/efk/aa.yaml b/efk/aa.yaml deleted file mode 100644 index 72a98f5..0000000 --- a/efk/aa.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kibana.k8s.elastic.co/v1 -kind: Secret -metadata: - name: kibana-sample -spec: - version: 8.15.1 - count: 3 - elasticsearchRef: - name: "elasticsearch-sample" - secureSettings: - - secretName: kibana-secret-settings diff --git a/efk/elasticsearch-deployment.yaml b/efk/elasticsearch-deployment.yaml deleted file mode 100644 index 23271b6..0000000 --- a/efk/elasticsearch-deployment.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# elasticsearch-deployment-8.8.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: elasticsearch - namespace: efk - labels: - app: elasticsearch -spec: - replicas: 1 - selector: - matchLabels: - app: elasticsearch - template: - metadata: - labels: - app: elasticsearch - spec: - containers: - - name: elasticsearch - image: docker.elastic.co/elasticsearch/elasticsearch:8.8.0 - ports: - - containerPort: 9200 - - containerPort: 9300 - env: - - name: discovery.type - value: "single-node" - - name: xpack.security.enabled - value: "true" - - name: ELASTIC_PASSWORD - valueFrom: - secretKeyRef: - name: elasticsearch-secret - key: elastic_password - - name: ES_JAVA_OPTS - value: "-Xms2g -Xmx4g" # 设置 JVM 堆大小为 2GB-4GB - resources: # 增加资源限制 - requests: - memory: "4Gi" - cpu: "1" - limits: - memory: "6Gi" - cpu: "2" - volumeMounts: - - name: data-volume - mountPath: /usr/share/elasticsearch/data - - name: config-volume - mountPath: /usr/share/elasticsearch/config - volumes: - - name: data-volume - persistentVolumeClaim: - claimName: elasticsearch-data-pvc - - name: config-volume - persistentVolumeClaim: - claimName: elasticsearch-config-pvc diff --git a/efk/elasticsearch-ingress.yaml b/efk/elasticsearch-ingress.yaml deleted file mode 100644 index a6b2572..0000000 --- a/efk/elasticsearch-ingress.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: elasticsearch - namespace: efk -spec: - ingressClassName: traefik - rules: - - host: elastic.k8s.xunlang.home - http: - paths: - - backend: - service: - name: elasticsearch - port: - number: 9200 - path: / - pathType: Prefix diff --git a/efk/elasticsearch-pv.yaml b/efk/elasticsearch-pv.yaml deleted file mode 100644 index c1dbfe9..0000000 --- a/efk/elasticsearch-pv.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: elasticsearch-data-pv -spec: - capacity: - storage: 300Gi - accessModes: - - ReadWriteOnce - storageClassName: microk8s-hostpath - hostPath: - path: /var/snap/microk8s/common/mnt/data/elasticsearch-data ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: elasticsearch-config-pv -spec: - capacity: - storage: 10Mi - accessModes: - - ReadWriteOnce - storageClassName: microk8s-hostpath - hostPath: - path: /var/snap/microk8s/common/mnt/data/elasticsearch-config diff --git a/efk/elasticsearch-pvc.yaml b/efk/elasticsearch-pvc.yaml deleted file mode 100644 index 141230f..0000000 --- a/efk/elasticsearch-pvc.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: elasticsearch-data-pvc - namespace: efk -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 300Gi - storageClassName: microk8s-hostpath # 确保匹配 - volumeName: elasticsearch-data-pv # 手动绑定 PV ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: elasticsearch-config-pvc - namespace: efk -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Mi - storageClassName: microk8s-hostpath # 确保匹配 - volumeName: elasticsearch-config-pv # 手动绑定 PV diff --git a/efk/elasticsearch-service.yaml b/efk/elasticsearch-service.yaml deleted file mode 100644 index 34fd91d..0000000 --- a/efk/elasticsearch-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: elasticsearch - namespace: efk -spec: - ports: - - port: 9200 - targetPort: 9200 - selector: - app: elasticsearch - type: LoadBalancer diff --git a/efk/fileBeat-config.yaml b/efk/fileBeat-config.yaml deleted file mode 100644 index 600eee9..0000000 --- a/efk/fileBeat-config.yaml +++ /dev/null @@ -1,62 +0,0 @@ -# filebeat-config.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: filebeat-config - namespace: efk -data: - filebeat.yml: | - filebeat.inputs: - - type: http_endpoint - enabled: true - listen_address: 0.0.0.0:8888 - path: "/" - json.keys_under_root: true - - processors: - # 提取路径中的变量（严格模式） - - dissect: - tokenizer: "/tanya.candle.%{currency}.%{year}.%{interval}" - field: "http.request.path" - target_prefix: "" - ignore_missing: false # 关键：关闭忽略缺失 - - # 强制设置默认值（即使字段为空） - - script: - lang: javascript - source: | - function process(event) { - // 先检查字段是否存在，不存在则设置默认值 - if (!event.containsKey('currency') || event.get('currency') === '') { - event.put('currency', 'unknown'); - } - if (!event.containsKey('year') || event.get('year') === '') { - event.put('year', '0000'); - } - if (!event.containsKey('interval') || event.get('interval') === '') { - event.put('interval', '0D'); - } - } - - output.elasticsearch: - hosts: ["http://elasticsearch:9200"] - username: "fluentd_user" - password: "fluentd_password" - indices: - - index: "logstash-candle-${currency}-${year}-${interval}" - # 严格验证字段值非空 - when.and: - - not.equals: - currency: "" - - not.equals: - year: "" - - not.equals: - interval: "" - - index: "fallback-index" - when.or: - - equals: - currency: "" - - equals: - year: "" - - equals: - interval: "" diff --git a/efk/fileBeat-daemonset.yaml b/efk/fileBeat-daemonset.yaml deleted file mode 100644 index 1a4ea40..0000000 --- a/efk/fileBeat-daemonset.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# filebeat-daemonset.yaml -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: filebeat - namespace: efk -spec: - selector: - matchLabels: - app: filebeat - template: - metadata: - labels: - app: filebeat - spec: - containers: - - name: filebeat - image: docker.elastic.co/beats/filebeat:8.12.0 - args: [ - "-c", "/etc/filebeat.yml", - "-e", - "-strict.perms=false" - ] - volumeMounts: - - name: config - mountPath: /etc/filebeat.yml - readOnly: true - subPath: filebeat.yml - - name: varlog - mountPath: /var/log - readOnly: true - volumes: - - name: config - configMap: - name: filebeat-config - - name: varlog - hostPath: - path: /var/log diff --git a/efk/fileBeat-ingress.yaml b/efk/fileBeat-ingress.yaml deleted file mode 100644 index fa81654..0000000 --- a/efk/fileBeat-ingress.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: filebeat-ingress - namespace: efk - annotations: - nginx.ingress.kubernetes.io/rewrite-target: / - # 添加 SSL 终止支持的注释，如果需要 TLS/SSL 支持 - # nginx.ingress.kubernetes.io/ssl-redirect: "true" -spec: - ingressClassName: traefik - rules: - - host: filebeat.k8s.xunlang.home - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: filebeat-service - port: - number: 8888 diff --git a/efk/fileBeat-service.yaml b/efk/fileBeat-service.yaml deleted file mode 100644 index ca32ead..0000000 --- a/efk/fileBeat-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: filebeat-service - namespace: efk -spec: - type: LoadBalancer - selector: - k8s-app: filebeat - ports: - - protocol: TCP - port: 8888 # Service 暴露的端口 - targetPort: 8888 # Fluentd 容器内部的端口 - diff --git a/efk/fluentd-configMap.yaml b/efk/fluentd-configMap.yaml deleted file mode 100644 index 0226110..0000000 --- a/efk/fluentd-configMap.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: fluentd-config - namespace: efk -data: - fluent.conf: | - - @type http - @id input_http - port 8888 - tag sardine.log - @label @main - - - - - - @type stdout - @id output_stdout_all - - diff --git a/efk/fluentd-configMap2.yaml b/efk/fluentd-configMap2.yaml deleted file mode 100644 index e698764..0000000 --- a/efk/fluentd-configMap2.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: fluentd-config - namespace: efk -data: - fluent.conf: | - - @type http - @id input_http - port 8888 - @label @main - @log_level debug - - @type json - - - -