Skip to content

Commit

Permalink
Merge pull request #72 from sysdiglabs/SECCOMP-27552
Browse files Browse the repository at this point in the history
Seccomp 27552
  • Loading branch information
eckelon authored Nov 3, 2023
2 parents 6acd981 + ed82387 commit f63615c
Show file tree
Hide file tree
Showing 358 changed files with 14,924 additions and 2,561 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/label-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Label issues
on:
issues:
types:
- reopened
- opened
jobs:
label_issues:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/github-script@v6
with:
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ["status: new"]
})
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ target/
.settings/
.classpath
dependency-reduced-pom.xml

output.txt
pom.xml.versionsBackup
integration_test_suite/integration_tests/src/test/resources/common/**.jar
output.log
stress-test.log
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Prometheus uses GitHub to manage reviews of pull requests.
addressing (with `@...`) the maintainer of this repository (see
[MAINTAINERS.md](MAINTAINERS.md)) in the description of the pull request.

- The project uses a simplified Gitflow branching paradigm

- Pull requests should be opened against `development` for the next release

* If you plan to do something more involved, first discuss your ideas
on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).
This will avoid unnecessary work and surely give you and us a good deal
Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
* Fabian Stäber <[email protected]> @fstab
* Doug Hoard <[email protected]> @dhoard
* Tom Wilkie <[email protected]> @tomwilkie
96 changes: 77 additions & 19 deletions MAINTAINER_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,94 @@
# Maintainer Notes

## Update Dependency Versions
Shell scripts to build and release are located int the `tools` directory.

Use the [Versions Maven Plugin](https://www.mojohaus.org/versions-maven-plugin/index.html). Rules are configured in `version-rules.xml`.
## Build a pre-release
___

**Pre-release builds are not source controlled (no branch, no tag)**

Command

```shell
./tools/build-and-copy.sh <version> <destination directory>
```
./mvnw versions:use-next-releases

Example

```shell
./tools/build-and-copy.sh 0.20.0-ALPHA-1 "/tmp/"
```

## Release
The jars will be located in `/tmp`

## Build and stage
___

Release builds are source controlled.

- Creates a `release-<version>` branch
- Creates a `<version>` tag
- Pushes the branch and tag to GitHub
- Stages the release to Maven Central

### Step 1

Command

```shell
./tools/build-and-stage.sh <version>
```
./mvnw release:prepare -DreleaseVersion=0.17.2 -DdevelopmentVersion=0.17.2-SNAPSHOT
./mvnw release:perform -DreleaseVersion=0.17.2 -DdevelopmentVersion=0.17.2-SNAPSHOT

Example

```shell
./tools/build-and-stage.sh 0.20.0
```

`release:prepare` does Github tags and commits, while `release:perform` signs the artifacts and uploads them to the staging repositoring on [https://oss.sonatype.org](https://oss.sonatype.org).
### Step 2

Download the staged artifacts from Maven Central and run the integration test suite.

Example

Download the artifacts from the staging repository [https://oss.sonatype.org/#stagingRepositories](https://oss.sonatype.org/#stagingRepositories) and verify them manually:
```shell
/home/dhoard/Downloads/jmx_prometheus_javaagent-0.20.0.jar
/home/dhoard/Downloads/jmx_prometheus_httpserver-0.20.0.jar
```

Command

```sh
# agent
/usr/lib/jvm/java-11-openjdk/bin/java -javaagent:/home/fabian/Downloads/jmx_prometheus_javaagent-0.17.2.jar=12345:./integration_tests/smoke_tests/src/test/resources/config.yml -jar integration_tests/jmx_example_application/target/jmx_example_application.jar
/usr/lib/jvm/java-17-openjdk/bin/java -javaagent:/home/fabian/Downloads/jmx_prometheus_javaagent-0.17.2.jar=12345:./integration_tests/smoke_tests/src/test/resources/config.yml -jar integration_tests/jmx_example_application/target/jmx_example_application.jar
/usr/lib/jvm/jdk1.6.0_45/bin/java -javaagent:/home/fabian/Downloads/jmx_prometheus_javaagent_java6-0.17.2.jar=12345:./integration_tests/smoke_tests/src/test/resources/config.yml -jar integration_tests/jmx_example_application/target/jmx_example_application.jar
```shell
./tools/patch-and-run-integration-test-suite.sh <javaagent.jar> <httpserver.jar>
```

# standalone
java -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar integration_tests/jmx_example_application/target/jmx_example_application.jar
Example

/usr/lib/jvm/java-11-openjdk/bin/java -jar ~/Downloads/jmx_prometheus_httpserver-0.17.2.jar 9000 ./integration_tests/smoke_tests/src/test/resources/config-httpserver.yml
/usr/lib/jvm/java-17-openjdk/bin/java -jar ~/Downloads/jmx_prometheus_httpserver-0.17.2.jar 9000 ./integration_tests/smoke_tests/src/test/resources/config-httpserver.yml
/usr/lib/jvm/jdk1.6.0_45/bin/java -jar ~/Downloads/jmx_prometheus_httpserver_java6-0.17.2.jar 9000 ./integration_tests/smoke_tests/src/test/resources/config-httpserver.yml
```shell
./tools/patch-and-run-integration-test-suite.sh /home/dhoard/Downloads/jmx_prometheus_javaagent-0.20.0.jar /home/dhoard/Downloads/jmx_prometheus_httpserver-0.20.0.jar
```

If everything looks good, click `Close` to trigger Sonatype's verification, then click `Release`.
### Step 3

If the integration test suite in Step 2 passes, on Maven Central...

- Click `Close` to trigger Sonatype's verification
- Once closed, click `Release`


### Step 4

Verify the files are available via Maven Central (Maven)

Create a GitHub release

### Step 5

Checkout the `main` branch and increment the version

```shell
git checkout main
./tools/change-version.sh 0.20.1-SNAPSHOT
git add -u
git commit -m "prepare for next development iteration"
```
5 changes: 5 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ Copyright 2012-2015 The Prometheus Authors

This product includes software developed at
SoundCloud Ltd. (http://soundcloud.com/).

This product includes software based on Stackoverflow
Code : toHex() method
Author : maybeWeCouldStealAVan
Reference: https://stackoverflow.com/questions/9655181/how-to-convert-a-byte-array-to-a-hex-string-in-java
Loading

0 comments on commit f63615c

Please sign in to comment.