Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: HXSecurity/Dongtai-Base-Image
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.16.1
Choose a base ref
...
head repository: HXSecurity/Dongtai-Base-Image
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 12, 2024

  1. Update logstash-mysql.conf

    st1020 authored Apr 12, 2024
    Copy the full SHA
    c00bbaa View commit details
  2. Merge pull request #203 from st1020/patch-1

    Update logstash-mysql.conf
    lingyuguo authored Apr 12, 2024
    Copy the full SHA
    e789baa View commit details

Commits on Apr 22, 2024

  1. Update Dockerfile

    lingyuguo authored Apr 22, 2024
    Copy the full SHA
    7a3ac0d View commit details
  2. Create deploy_max.yaml

    lingyuguo authored Apr 22, 2024
    Copy the full SHA
    b34f296 View commit details

Commits on Dec 18, 2024

  1. Update release_base_image.yaml

    lingyuguo authored Dec 18, 2024
    Copy the full SHA
    4605cce View commit details
  2. Update release_base_image.yaml

    lingyuguo authored Dec 18, 2024
    Copy the full SHA
    a0c5ddc View commit details
Showing with 27 additions and 3 deletions.
  1. +23 −0 .github/workflows/deploy_max.yaml
  2. +2 −2 .github/workflows/release_base_image.yaml
  3. +1 −0 logstash/Dockerfile
  4. +1 −1 logstash/logstash-mysql.conf
23 changes: 23 additions & 0 deletions .github/workflows/deploy_max.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Deploy max

on:
push:
branches:
- main
- beta
- develop

jobs:
build:
if: ${{ github.event_name == 'push' && github.repository_owner == 'HXSecurity' }}
runs-on: ubuntu-latest
strategy:
max-parallel: 4
steps:
- name: deploy to cluster B
uses: tscuite/kubectl-helm-action@main
env:
MAX: true
PROJECT: mysql
TOKEN_SCA: ${{ secrets.MAX_TOKEN_SCA }}
KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_TEST_DATA }}
4 changes: 2 additions & 2 deletions .github/workflows/release_base_image.yaml
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ jobs:
with:
context: ./mysql
push: true
# platforms: linux/amd64,linux/arm64
#platforms: linux/amd64,linux/arm64
tags: |
dongtai/dongtai-mysql:${{ steps.release.outputs.version }}
# dongtai/dongtai-mysql:latest
@@ -153,4 +153,4 @@ jobs:
platforms: linux/amd64,linux/arm64
tags: |
dongtai/dongtai-mysql-8:${{ steps.release.outputs.version }}
# dongtai/dongtai-mysql-8:latest
dongtai/dongtai-mysql-8:latest
1 change: 1 addition & 0 deletions logstash/Dockerfile
Original file line number Diff line number Diff line change
@@ -6,3 +6,4 @@ copy pipelines.yml /usr/share/logstash/config/
copy jvm.options /usr/share/logstash/config/
copy logstash-mysql.conf /usr/share/logstash/pipeline/logstash.conf


2 changes: 1 addition & 1 deletion logstash/logstash-mysql.conf
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ output {
connection_string => "jdbc:mysql://${DATABASE}?useSSL=false"
username => "${USERNAME}"
password => "${PASSWORD}"
statement => [ "INSERT IGNORE INTO `iast_agent_method_pool` (`agent_id`,`url`, `uri`, `http_method`, `http_scheme`, `http_protocol`, `req_header`, `req_params`, `req_data`, `res_header`, `res_body`, `context_path`, `method_pool`, `clent_ip`, `create_time`, `update_time`, `pool_sign`, `req_header_for_search`, `uri_sha1`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)","agent_id","url","uri","http_method","http_scheme","http_protocol","req_header","req_params","req_data","res_header","res_body","context_path","method_pool","clent_ip","create_time","update_time","pool_sign","req_header_for_search","uri_sha1"]
statement => [ "INSERT IGNORE INTO `iast_agent_method_pool` (`agent_id`,`url`, `uri`, `http_method`, `http_scheme`, `http_protocol`, `req_header`, `req_params`, `req_data`, `res_header`, `res_body`, `context_path`, `method_pool`, `clent_ip`, `create_time`, `update_time`, `pool_sign`, `req_header_for_search`, `uri_sha1`, `pattern_uri`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)","agent_id","url","uri","http_method","http_scheme","http_protocol","req_header","req_params","req_data","res_header","res_body","context_path","method_pool","clent_ip","create_time","update_time","pool_sign","req_header_for_search","uri_sha1","pattern_uri"]
}
}
}