Skip to content

Commit e4da184

Browse files
authored
Merge pull request #2 from sysflow-telemetry/dev
Merging dev into master.
2 parents c2ce7cf + d0bcdee commit e4da184

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+4636
-413
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ build
3737
dist
3838
*.egg-info
3939
*.antlr
40+
.vscode
41+
*.ipynb_checkpoints/

CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,26 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
1313
> - **Fixed**: for any bug fixes.
1414
> - **Security**: in case of vulnerabilities.
1515
16-
## [[UNRELEASED](https://github.com/sysflow-telemetry/sf-apis/compare/0.1-rc3...HEAD)]
16+
## [[UNRELEASED](https://github.com/sysflow-telemetry/sf-apis/compare/0.1.0-rc4...HEAD)]
17+
18+
## [[0.1.0-rc4](https://github.com/sysflow-telemetry/sf-apis/compare/0.1-rc3...0.1.0-rc4)] - 2020-08-10
19+
20+
### Added
21+
22+
- Added `node.id`, `node.ip`, `proc.entry`, and `schema` attributes to query language and export APIs.
23+
- Added golang APIs.
24+
25+
### Changed
26+
27+
- Support for new Avro schema (version 2).
28+
- Added missing EXIT opflag to Python APIs.
29+
- Adding patch level to comply with semnatic versioning.
30+
31+
### Fixed
32+
33+
- Fixed open flags bitmaps.
34+
- Fixed attribute name typo when computing proc and pproc duration.
35+
- Fixed bug in provenance queries.
1736

1837
## [[0.1-rc3](https://github.com/sysflow-telemetry/sf-apis/compare/0.1-rc2...0.1-rc3)] - 2020-03-17
1938

Dockerfile.sfnb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
FROM jupyter/minimal-notebook
1+
FROM jupyter/scipy-notebook
22

3-
# Install pandas, numpy, and graphviz python bindings
4-
RUN pip install graphviz pandas numpy matplotlib
3+
# Install graphviz python bindings
54
RUN conda install -y graphviz
65

76
# Change user to root
@@ -14,12 +13,13 @@ RUN apt-get update -yqq && \
1413
apt-get clean -yqq && \
1514
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/apt/archive/*
1615

17-
# Install sysflow API
18-
COPY py3 /build
19-
RUN cd /build && python setup.py install && rm -r /build
16+
# Copy sources
17+
COPY --chown=$NB_UID:$NB_UID py3 /tmp/build
2018

2119
# Switch back to jovyan to avoid accidental container runs as root
2220
USER $NB_UID
2321

24-
# Copy example scripts into container
25-
#COPY pynb /home/$NB_USER/work
22+
# Install sysflow API
23+
RUN cd /tmp/build && pip install . && rm -r /tmp/build
24+
25+

Dockerfile.sysprint

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ FROM registry.access.redhat.com/ubi8/ubi
2020

2121
# Install Python environment
2222
RUN dnf install -y --disableplugin=subscription-manager \
23+
gcc \
2324
python3 \
24-
python3-wheel && \
25+
python3-devel \
26+
python3-wheel && \
2527
dnf -y clean all && rm -rf /var/cache/dnf && \
2628
mkdir -p /usr/local/lib/python3.6/site-packages && \
2729
ln -s /usr/bin/easy_install-3 /usr/bin/easy_install

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# Supported tags and respective `Dockerfile` links
88

9-
- [`0.1-rc3`](https://github.com/sysflow-telemetry/sf-exporter/blob/0.1-rc3/Dockerfile), [`latest`](https://github.com/sysflow-telemetry/sf-apis/blob/master/Dockerfile)
9+
- [`0.1.0-rc4`](https://github.com/sysflow-telemetry/sf-exporter/blob/0.1.0-rc4/Dockerfile), [`latest`](https://github.com/sysflow-telemetry/sf-apis/blob/master/Dockerfile)
1010

1111
# Quick reference
1212

avro/avdl/entity/file.avdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import idl "container.avdl";
2323
record File {
2424
sysflow.type.SFObjectState state; //state of file - created, modified, reupped
2525
sysflow.type.FOID oid; // hash file id, container id, into 128 bit value.
26-
timestamp_ms ts;
26+
long ts;
2727
int restype;
2828
string path;
2929
union{null, string} containerId;

avro/avdl/entity/header.avdl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
@namespace("sysflow.entity")
2020
protocol SysFlow {
2121
record SFHeader {
22-
long version;
23-
string exporter;
22+
long version = 2;
23+
string exporter;
24+
string ip = "NA";
2425
}
2526
}

avro/avdl/entity/process.avdl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ record Process {
2424
sysflow.type.SFObjectState state; //sysflow process object state.. created, modified, reupped
2525
sysflow.type.OID oid; // monotonic process creation time + host PID
2626
union{null, sysflow.type.OID} poid;
27-
timestamp_ms ts;
27+
long ts;
2828
//int hpid;
2929
string exe;
3030
string exeArgs;
@@ -38,5 +38,6 @@ record Process {
3838
//int threadCount;
3939
//int childCount;
4040
union{null, string} containerId;
41+
boolean entry = false;
4142
}
4243
}

avro/avdl/event/fileevent.avdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protocol SysFlow {
2121
import idl "../type/datatypes.avdl";
2222
record FileEvent {
2323
sysflow.type.OID procOID; // host ID + monotonic process creation time + host PID
24-
timestamp_ms ts;
24+
long ts;
2525
long tid;
2626
int opFlags;
2727
sysflow.type.FOID fileOID;

avro/avdl/event/networkevent.avdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protocol SysFlow {
2121
import idl "../type/datatypes.avdl";
2222
record NetworkEvent {
2323
sysflow.type.OID procOID; // host ID + monotonic process creation time + host PID
24-
timestamp_ms ts;
24+
long ts;
2525
long tid;
2626
int opFlags;
2727
int sip;

0 commit comments

Comments
 (0)