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

Giles/rox 9409 setting probe name and probe version #21

Merged
merged 3 commits into from
May 13, 2022
Merged

Giles/rox 9409 setting probe name and probe version #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c91d95
X-Smart-Branch-Parent: master
Stringy May 13, 2022
34911f7
ROX-9409: removes PROBE_NAME and PROBE_VERSION in favour of DRIVER_NA…
Stringy Feb 22, 2022
7354e82
ROX-9409: renames sysdig event to new naming scheme
Stringy May 6, 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
17 changes: 0 additions & 17 deletions cmake/modules/libscap.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,6 @@ get_filename_component(DRIVER_CONFIG_DIR ${CMAKE_BINARY_DIR}/driver/src ABSOLUTE
get_filename_component(LIBSCAP_INCLUDE_DIR ${LIBSCAP_DIR}/userspace/libscap ABSOLUTE)
set(LIBSCAP_INCLUDE_DIRS ${LIBSCAP_INCLUDE_DIR} ${DRIVER_CONFIG_DIR})

if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(KBUILD_FLAGS "${FALCOSECURITY_LIBS_DEBUG_FLAGS}")
endif()

if(NOT DEFINED PROBE_VERSION)
set(PROBE_VERSION "${SYSDIG_VERSION}")
endif()
if(NOT DEFINED PROBE_NAME)
set(PROBE_NAME "collector")
endif()

if(NOT DEFINED PROBE_DEVICE_NAME)
set(PROBE_DEVICE_NAME "sysdig")
endif()
endif()

if(BUILD_USERSPACE)
add_subdirectory(${LIBSCAP_DIR}/userspace/libscap ${PROJECT_BINARY_DIR}/libscap)
elseif(((BUILD_DRIVER) OR (BUILD_BPF)) AND (CMAKE_SYSTEM_NAME MATCHES "Linux"))
Expand Down
2 changes: 1 addition & 1 deletion driver/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ static int ppm_open(struct inode *inode, struct file *filp)
}
}
set_bit(PPME_DROP_X, consumer->events_mask);
set_bit(PPME_SYSDIGEVENT_E, consumer->events_mask);
set_bit(PPME_PLUGINEVENT_E, consumer->events_mask);
set_bit(PPME_CONTAINER_E, consumer->events_mask);
set_bit(PPME_CONTAINER_X, consumer->events_mask);
} else {
Expand Down