Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/sflow input module #187

Merged
16 commits merged into from
Jan 31, 2022
Merged

Feature/sflow input module #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4a3a322
add sflow header file
Jan 24, 2022
f2e1370
Create sflow input module template
Jan 24, 2022
df15cae
draft implementation of sflow based on sflowtool
Jan 26, 2022
d23ee80
Add small fixes
Jan 27, 2022
c7efb9d
Salve samples in sample vector and parse sflow counters data
Jan 27, 2022
4c784ac
Add unit tests for sflow input
Jan 28, 2022
a447201
Create pktvisor-sflow cmd
Jan 28, 2022
a2a5cc9
Improve code coverage sflow
Jan 28, 2022
4fd374e
add static cast to fix CI build
Jan 28, 2022
3207b58
create pktvisor-reader to summarize input files offline
Jan 28, 2022
917bbae
Replace pktvisor-pcap with pktvisor-reader
Jan 28, 2022
6c93a70
Expose error count in sflow input module
Jan 31, 2022
368cdfb
Fix sflow input stream README
Jan 31, 2022
d786439
fix sflow json response
Jan 31, 2022
6ccdef2
Perform atomic_load in error_count
Jan 31, 2022
eb8f389
add sleep to guarantee that udp packet arrived
Jan 31, 2022
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
48 changes: 9 additions & 39 deletions .github/workflows/static_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,59 +101,29 @@ jobs:
name: ${{ env.BINARY_NAME }}
path: ${{github.workspace}}/${{ env.BINARY_NAME }}

- name: Build and push static pktvisor-pcap container
- name: Build and push static pktvisor-reader container
if: github.event_name != 'pull_request'
env:
BASE_BINARY: pktvisor-pcap
IMAGE_NAME: ns1labs/pktvisor-pcap-slim
BASE_BINARY: pktvisor-reader
IMAGE_NAME: ns1labs/pktvisor-reader-slim
run: |
docker build -f docker/Dockerfile.${{ env.BASE_BINARY }}-static -t ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} .
docker push -a ${{ env.IMAGE_NAME }}
echo "CONT_ID=$(docker create --name ${{ env.BASE_BINARY }}-slim-tmp ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }})" >> $GITHUB_ENV

- name: Extract static pktvisor-pcap asset
- name: Extract static pktvisor-reader asset
if: github.event_name != 'pull_request'
env:
BASE_BINARY: pktvisor-pcap
IMAGE_NAME: ns1labs/pktvisor-pcap-slim
BASE_BINARY: pktvisor-reader
IMAGE_NAME: ns1labs/pktvisor-reader-slim
run: |
docker cp ${{ env.CONT_ID }}:/${{ env.BASE_BINARY }} ${{github.workspace}}/${{ env.BASE_BINARY }}-linux-x86_64-${{ env.VERSION }}

- name: Upload pktvisor-pcap artifact
- name: Upload pktvisor-reader artifact
if: github.event_name != 'pull_request'
env:
BINARY_NAME: pktvisor-pcap-linux-x86_64-${{ env.VERSION }}
BINARY_NAME: pktvisor-reader-linux-x86_64-${{ env.VERSION }}
uses: actions/upload-artifact@v2
with:
name: ${{ env.BINARY_NAME }}
path: ${{github.workspace}}/${{ env.BINARY_NAME }}


- name: Build and push static pktvisor-dnstap container
if: github.event_name != 'pull_request'
env:
BASE_BINARY: pktvisor-dnstap
IMAGE_NAME: ns1labs/pktvisor-dnstap-slim
run: |
docker build -f docker/Dockerfile.${{ env.BASE_BINARY }}-static -t ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} .
docker push -a ${{ env.IMAGE_NAME }}
echo "CONT_ID=$(docker create --name ${{ env.BASE_BINARY }}-slim-tmp ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }})" >> $GITHUB_ENV

- name: Extract static pktvisor-dnstap asset
if: github.event_name != 'pull_request'
env:
BASE_BINARY: pktvisor-dnstap
IMAGE_NAME: ns1labs/pktvisor-dnstap-slim
run: |
docker cp ${{ env.CONT_ID }}:/${{ env.BASE_BINARY }} ${{github.workspace}}/${{ env.BASE_BINARY }}-linux-x86_64-${{ env.VERSION }}

- name: Upload pktvisor-dnstap artifact
if: github.event_name != 'pull_request'
env:
BINARY_NAME: pktvisor-dnstap-linux-x86_64-${{ env.VERSION }}
uses: actions/upload-artifact@v2
with:
name: ${{ env.BINARY_NAME }}
path: ${{github.workspace}}/${{ env.BINARY_NAME }}


path: ${{github.workspace}}/${{ env.BINARY_NAME }}
1 change: 1 addition & 0 deletions 3rd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ message(STATUS "3rd party libraries")
add_subdirectory(datasketches)
add_subdirectory(fstrm)
add_subdirectory(rng)
add_subdirectory(sflow)
add_subdirectory(timer)
15 changes: 15 additions & 0 deletions 3rd/sflow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
add_library(sflow INTERFACE)

target_include_directories(sflow
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
)

target_compile_features(sflow INTERFACE cxx_std_11)

target_sources(sflow
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/sflow.h
${CMAKE_CURRENT_SOURCE_DIR}/sflow_drop.h
${CMAKE_CURRENT_SOURCE_DIR}/sflow_v2v4.h
)
Loading