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.

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

sync 0.17.x branch #1974

Merged

Conversation

LucaGuerra
Copy link
Contributor

@LucaGuerra LucaGuerra commented Jul 23, 2024

What type of PR is this?

Uncomment one (or more) /kind <> lines:

/kind bug

Any specific area of the project related to this PR?

Uncomment one (or more) /area <> lines:

/area driver-kmod

/area driver-bpf

/area driver-modern-bpf

/area libsinsp

Does this PR require a change in the driver versions?

/version driver-API-version-patch

What this PR does / why we need it:

Sync 0.17.x release branch with the following changes:

Also, increment driver API version because we are patching it (@FedeDP please double check that this is correct). API version does not need to be incremented

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

FedeDP and others added 11 commits July 23, 2024 13:19
Properly keep a reference on m_sinsp_stats_v2 where needed, instead of fetching it every time.
Moreover, improve perf in `sinsp_utils::ts_to_string`: cache `gmt2local` result instead of fetching it every time as it is an heavy operation.

Signed-off-by: Federico Di Pierro <[email protected]>
… return empty value, to be skipped, when requirements are not met.

For now, this means that metrics that require `m_sinsp_stats_v2` will be automatically skipped when it is disabled.

Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Andrea Terzolo <[email protected]>
Co-authored-by: Federico Di Pierro <[email protected]>
Copy link

github-actions bot commented Jul 23, 2024

Please double check driver/API_VERSION file. See versioning.

/hold

@FedeDP
Copy link
Contributor

FedeDP commented Jul 23, 2024

I think we also need #1940 and #1899 for windows related CI jobs.

@FedeDP
Copy link
Contributor

FedeDP commented Jul 31, 2024

/milestone 0.17.3

@poiana poiana added this to the 0.17.3 milestone Jul 31, 2024
@FedeDP
Copy link
Contributor

FedeDP commented Jul 31, 2024

Added also #1979 to the 0.17.3 milestone.

@FedeDP
Copy link
Contributor

FedeDP commented Jul 31, 2024

Moved also #1946 to 0.17.3 milestone to fix

Drivers CI Build / build-scap-open-w-extern-bpf-skeleton (pull_request) Failing after 10s

driver/API_VERSION Outdated Show resolved Hide resolved
geraldcombs and others added 5 commits July 31, 2024 09:43
Build zlib using CMake on Windows instead of nmake. The nmakefile passes
"-base:0x5A4C0000" to the linker, which is too small on Arm64 and not
really needed or wanted on any platform these days.

madler/zlib#325

Signed-off-by: Gerald Combs <[email protected]>
Set CMAKE_POLICY_DEFAULT_CMP0091, CMAKE_MSVC_RUNTIME_LIBRARY,
and CMAKE_BUILD_TYPE when we configure zlib, similar to our other
dependencies.

Signed-off-by: Gerald Combs <[email protected]>
The debug versions of zlib have a "d" in their name, e.g. zlibstaticd.lib.

Signed-off-by: Gerald Combs <[email protected]>
@LucaGuerra
Copy link
Contributor Author

Thanks @FedeDP , added everything

geraldcombs and others added 6 commits August 1, 2024 07:54
Include cri.hpp in container.cpp in order to avoid

```
/usr/bin/ld: /usr/lib/aarch64-linux-gnu/libsinsp.so: undefined reference to `libsinsp::cri::cri_interface<libsinsp::cri::cri_api_v1>::get_cri_runtime_type() const'
collect2: error: ld returned 1 exit status
```

when building with shared libs on Linux.

Signed-off-by: Gerald Combs <[email protected]>
Copy link
Contributor

@FedeDP FedeDP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@poiana
Copy link
Contributor

poiana commented Aug 1, 2024

LGTM label has been added.

Git tree hash: 58713b9e3d6b81e8cfba568ef8bd21623cdce595

Copy link
Member

@Andreagit97 Andreagit97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@poiana
Copy link
Contributor

poiana commented Aug 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Andreagit97, FedeDP, LucaGuerra

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [Andreagit97,FedeDP,LucaGuerra]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@FedeDP
Copy link
Contributor

FedeDP commented Aug 1, 2024

/unhold

@poiana poiana merged commit c0c6639 into falcosecurity:release/0.17.x Aug 1, 2024
49 of 52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants