-
Notifications
You must be signed in to change notification settings - Fork 733
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Support BPM container type Identify BPM containers by "bpm-" prefix in cgroup-path. See also cloudfoundry/bpm-release#109 and cloudfoundry/bpm-release@ea7fef1 sysdig-CLA-1.0-contributing-entity: SAP SE sysdig-CLA-1.0-signed-off-by: David Ansari <[email protected]> * Update userspace/libsinsp/container_engine/bpm.cpp Co-Authored-By: ansd <[email protected]> * Ensure BPM container ID contains only valid chars sysdig-CLA-1.0-contributing-entity: SAP SE sysdig-CLA-1.0-signed-off-by: David Ansari <[email protected]> * Remove dependency to stdlib regex sysdig-CLA-1.0-contributing-entity: SAP SE sysdig-CLA-1.0-signed-off-by: David Ansari <[email protected]>
- Loading branch information
Showing
7 changed files
with
117 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
Copyright (C) 2013-2019 Draios Inc dba Sysdig. | ||
This file is part of sysdig. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
#include "container_engine/bpm.h" | ||
#include "sinsp.h" | ||
|
||
using namespace libsinsp::container_engine; | ||
|
||
bool bpm::resolve(sinsp_container_manager* manager, sinsp_threadinfo* tinfo, bool query_os_for_missing_info) | ||
{ | ||
sinsp_container_info container_info; | ||
bool matches = false; | ||
|
||
for(auto it = tinfo->m_cgroups.begin(); it != tinfo->m_cgroups.end(); ++it) | ||
{ | ||
string cgroup = it->second; | ||
size_t pos; | ||
|
||
// | ||
// Non-systemd and systemd BPM | ||
// | ||
pos = cgroup.find("bpm-"); | ||
if(pos != string::npos) | ||
{ | ||
auto id_start = pos + sizeof("bpm-") - 1; | ||
auto id_end = cgroup.find(".scope", id_start); | ||
auto id = cgroup.substr(id_start, id_end - id_start); | ||
|
||
// As of BPM v1.0.3, the container ID is only allowed to contain the following chars | ||
// see https://github.com/cloudfoundry-incubator/bpm-release/blob/v1.0.3/src/bpm/jobid/encoding.go | ||
if (!id.empty() && strspn(id.c_str(), "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._-") == id.size()) | ||
{ | ||
container_info.m_type = CT_BPM; | ||
container_info.m_id = id; | ||
matches = true; | ||
break; | ||
} | ||
} | ||
} | ||
|
||
if (!matches) | ||
{ | ||
return false; | ||
} | ||
|
||
tinfo->m_container_id = container_info.m_id; | ||
if (!manager->container_exists(container_info.m_id)) | ||
{ | ||
container_info.m_name = container_info.m_id; | ||
manager->add_container(container_info, tinfo); | ||
manager->notify_new_container(container_info); | ||
} | ||
return true; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
Copyright (C) 2013-2019 Draios Inc dba Sysdig. | ||
This file is part of sysdig. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
#pragma once | ||
|
||
class sinsp_container_manager; | ||
class sinsp_container_info; | ||
class sinsp_threadinfo; | ||
|
||
#include "container_engine/container_engine.h" | ||
|
||
namespace libsinsp { | ||
namespace container_engine { | ||
class bpm : public resolver | ||
{ | ||
public: | ||
bool resolve(sinsp_container_manager* manager, sinsp_threadinfo* tinfo, bool query_os_for_missing_info) override; | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters