Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
D
docker-elk
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • JIRA
    • JIRA
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 段孔乐
  • docker-elk
  • Merge Requests
  • !4

Merged
Opened Jul 28, 2021 by 段孔乐@dkl 
  • Report abuse
Report abuse

add production data, modify es index generate rule

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b test-server origin/test-server

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout main
git merge --no-ff test-server

Step 4. Push the result of the merge to GitLab

git push origin main

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 2
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 段孔乐 @dkl

    added 14 commits

    • f93260e6...863848e8 - 13 commits from branch main
    • fa3854f5 - Merge branch 'main' into 'test-server'

    Compare with previous version

    · Jul 28, 2021

    added 14 commits

    • f93260e6...863848e8 - 13 commits from branch main
    • fa3854f5 - Merge branch 'main' into 'test-server'

    Compare with previous version

    added 14 commits <ul><li>f93260e6...863848e8 - 13 commits from branch <code>main</code></li><li>fa3854f5 - Merge branch &#39;main&#39; into &#39;test-server&#39;</li></ul> [Compare with previous version](https://gitlab.33.cn/dkl/docker-elk/merge_requests/4/diffs?diff_id=7785&start_sha=f93260e6b0cce612a9d8150fd371cf825bfd3af3)
    Toggle commit list
  • 段孔乐 @dkl

    merged

    · Jul 28, 2021

    merged

    merged
    Toggle commit list
  • 段孔乐 @dkl

    mentioned in commit 552a168b

    · Jul 28, 2021

    mentioned in commit 552a168b

    mentioned in commit 552a168b33b9c23e88f0f757127cd548f85314b5
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: dkl/docker-elk!4

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.