Skip to content

Commit

Permalink
Merge branch 'main' into feature-flag-proposal
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored May 9, 2024
2 parents 1de0ba3 + 7126fab commit ae1abe5
Show file tree
Hide file tree
Showing 16 changed files with 124 additions and 360 deletions.
13 changes: 13 additions & 0 deletions .cspell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,22 @@ ignoreRegExpList:
- Slack Channel ID
- Google Docs ID
words:
- Collibra
- DASD
- datadog
- dynatrace
- easycla
- eiffel
- elastic
- emea
- faas
- galkleinman
- gitter
- grafana
- gyliu513
- Hostmetrics
- isovalent
- labs
- Liudmila
- Nale
- REXX
Expand All @@ -30,6 +36,7 @@ words:
- afrittoli
- alanwest
- alevenberg
- alexvanboxel
- alolita
- amye
- andré
Expand Down Expand Up @@ -100,12 +107,14 @@ words:
- juraci
- kamphaus
- kanzhelev
- kelnage
- keptn
- krzko
- kröhling
- kubecon
- kuisathaverat
- lalitb
- lambdanis
- liatrio
- lightstep
- lmolkova
Expand All @@ -118,8 +127,10 @@ words:
- mateuszrzeszutek
- mayur
- mayurkale
- mdelfabro
- mhausenblas
- mirabella
- mjwolf
- molkova
- msomasu
- mtwo
Expand Down Expand Up @@ -150,6 +161,7 @@ words:
- proto
- pyohannes
- pytest
- raesene
- reiley
- reyang
- rrschulze
Expand Down Expand Up @@ -196,6 +208,7 @@ words:
- trendable
- triager
- triagers
- trisch-me
- tsloughter
- tylerbenson
- xibz
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/membership.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ Please remember, it is an applicant's responsibility to get their sponsors' conf

- PRs reviewed / authored
- Issues responded to
- Community activities I organized/ran
- SIG projects I am involved with
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ SIG-specific GitHub discussions.
| eBPF | Every week on Tuesday at 09:00 PT | [Google Doc](https://docs.google.com/document/d/13GK915hdDQ9sUYzUIWi4pOfJK68EE935ugutUgL3yOw) | [#otel-ebpf](https://cloud-native.slack.com/archives/C02AB15583A) | [calendar-ebpf](https://groups.google.com/a/opentelemetry.io/g/calendar-ebpf) | [Ted Young](https://github.com/tedsuo) |
| Client Instrumentation | Every Tuesday at 9:00 AM PT | [Google Doc](https://docs.google.com/document/d/16Vsdh-DM72AfMg_FIt9yT9ExEWF4A_vRbQ3jRNBe09w) | [#otel-client-side-telemetry](https://cloud-native.slack.com/archives/C0239SYARD2) | [calendar-client-side](https://groups.google.com/a/opentelemetry.io/g/calendar-client-side) | [Daniel Gomez Blanco](https://github.com/danielgblanco) |
| Kubernetes Operator | Every other week on Thursday at 09:00 PT | [Google Doc](https://docs.google.com/document/d/1Unbs2qp_j5kp8FfL_lRH-ld7i5EOQpsq0I4djkOOSL4) | [#otel-operator](https://cloud-native.slack.com/archives/C033BJ8BASU) | [calendar-k8s-operator](https://groups.google.com/a/opentelemetry.io/g/calendar-k8s-operator) | [Juraci Paixão Kröhling](https://github.com/jpkrohling) |
| Community Demo Application | Every Wednesday at 8:00 PT | [Google Doc](https://docs.google.com/document/d/16f-JOjKzLgWxULRxY8TmpM_FjlI1sthvKurnqFz9x98) | [#otel-community-demo](https://cloud-native.slack.com/archives/C03B4CWV4DA) | [calendar-demo-app](https://groups.google.com/a/opentelemetry.io/g/calendar-demo-app) | [Austin Parker](https://github.com/austinlparker) |
| Community Demo Application | Every other week on Wednesday at 8:00 PT | [Google Doc](https://docs.google.com/document/d/16f-JOjKzLgWxULRxY8TmpM_FjlI1sthvKurnqFz9x98) | [#otel-community-demo](https://cloud-native.slack.com/archives/C03B4CWV4DA) | [calendar-demo-app](https://groups.google.com/a/opentelemetry.io/g/calendar-demo-app) | [Austin Parker](https://github.com/austinlparker) |

<!-- endsigs -->
## Related groups
Expand Down
25 changes: 16 additions & 9 deletions areas-of-interest.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@ concerns.

### [Tigran Najaryan](https://github.com/tigrannajaryan), Splunk

- OpenTelemetry collector
- OpenTelemetry protocol
- OpenTelemetry schemas and versioning
- Logging API and SDK
- Entities
- OpAMP

### [Yuri Shkuro](https://github.com/yurishkuro), Meta

Expand All @@ -93,11 +94,11 @@ Maintainers and approvers are invited to list their areas of interest
to further assist the community in finding appropriate points of
contact.

### [Alex Boten](https://github.com/codeboten), Lightstep
### [Alex Boten](https://github.com/codeboten), Honeycomb

- OpenTelemetry Python
- OpenTelemetry Collector
- OTel-Lambda support
- OpenTelemetry Python
- SDK configuration

### [Daniel Dyla](https://github.com/dyladan), Dynatrace

Expand All @@ -108,11 +109,17 @@ contact.

### [Dan Jaglowski](https://github.com/djaglowski), observIQ

- OpenTelemetry log collection
- Logging API and SDK
- OpenTelemetry metric scrapers
- Semantic conventions
- Open Agent Management Protocol
- OpenTelemetry collector
- Log data model
- Traditional log ingestion
- Telemetry processing

### [Juraci Paixão Kröhling](https://github.com/jpkrohling), Grafana Labs

- OpenTelemetry Collector
- Distributed tracing
- Security
- Sampling

### [Tom Tan](https://github.com/ThomsonTan), Microsoft

Expand Down
1 change: 1 addition & 0 deletions community-membership.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Defined by: Member of the OpenTelemetry GitHub organization
may include, but is not limited to:
- Authoring or reviewing PRs on GitHub
- Filing or commenting on issues on GitHub
- Organizing and running activities (e.g. events, surveys) within the OpenTelemetry community
- Contributing to SIGs, subprojects, or community discussions (e.g. meetings,
chat, email, and discussion forums)
- [Joined the Slack channel](https://cloud-native.slack.com/archives/CJFCJHG4Q)
Expand Down
9 changes: 9 additions & 0 deletions docs/how-to-handle-public-calendar.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ A single Zoom account should not be used for back-to-back meetings or for more t
You can see which Zoom account any potentially conflicting meetings are using in the meeting descriptions.
(Note: posting the URLs publicly on GitHub leads to Zoom bombing by random bots).

#### Zoom link generation process
_This is the process that the person responding to Zoom link creation issues will follow. The instructions under this heading are for project admins (Governance Committee members) who have access to OpenTelemetry's Zoom account credentials._

1. View the OpenTelemetry meeting calendar, and find your desired time slot, along with the meetings that occur immediately before, during, and after it.
2. See which OpenTelemetry Zoom accounts are being used for the meetings immediately before, during, and after your desired time. The Zoom account name / number is typically listed in the description of each meeting; if it isn't, you can join a meeting (even if it isn't occurring now), click on the green shield icon in the top left, and see the account name / number in the 'host' field.
3. Choose a Zoom account that isn't already being used for one of the meetings immediately before, during, or after your desired time slot. You may also choose a Zoom account that is being used *exactly* once immediately before, during, or after (we can run a maximum of two concurrent meetings with each account).
4. Log into that Zoom account, click "Schedule a meeting", and create a recurring meeting with the desired meeting name and no fixed schedule.
5. Copy the newly generated unique Zoom link and paste it into the calendar event's description and location.

### Inviting attendees
All meetings should invite a publicly joinable google group `[email protected]` which is specific to the meeting series.
The google group should be set up as follows:
Expand Down
83 changes: 83 additions & 0 deletions projects/security-semconv.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# Security Semantic Conventions

## Description

The purpose of this project is to bring in the security domain for the OpenTelemetry community.

As outlined in the [ECS OTEP](https://github.com/open-telemetry/oteps/blob/main/text/0199-support-elastic-common-schema-in-opentelemetry.md), the Elastic Common Schema (ECS) is currently being contributed to the semantic conventions schema. Given the significance of security within ECS, establishing this SIG is crucial as it will expedite the donation of ECS fields tailored to security use cases. Beyond expanding the schema, our aim is to craft a clear vision for the instrumentation required.

## Deliverables

* Our current focus is on defining essential semantic conventions for security use cases.
* This includes but is not limited to the following namespaces:
* [`Code signature`](https://www.elastic.co/guide/en/ecs/current/ecs-code_signature.html)
* [`DLL`](https://www.elastic.co/guide/en/ecs/current/ecs-dll.html)
* [`DNS`](https://www.elastic.co/guide/en/ecs/current/ecs-dns.html)
* [`File`](https://www.elastic.co/guide/en/ecs/current/ecs-file.html)
* [`Group`](https://www.elastic.co/guide/en/ecs/current/ecs-group.html)
* [`Hash`](https://www.elastic.co/guide/en/ecs/current/ecs-hash.html)
* [`Host`](https://www.elastic.co/guide/en/ecs/current/ecs-host.html)
* [`Network`](https://www.elastic.co/guide/en/ecs/current/ecs-network.html)
* [`Operating System`](https://www.elastic.co/guide/en/ecs/current/ecs-os.html)
* [`Package`](https://www.elastic.co/guide/en/ecs/current/ecs-package.html)
* [`Process`](https://www.elastic.co/guide/en/ecs/current/ecs-process.html)
* [`Registry`](https://www.elastic.co/guide/en/ecs/current/ecs-registry.html)
* [`Risk information`](https://www.elastic.co/guide/en/ecs/current/ecs-risk.html)
* [`Rule`](https://www.elastic.co/guide/en/ecs/current/ecs-rule.html)
* [`Threat`](https://www.elastic.co/guide/en/ecs/current/ecs-threat.html)
* [`TLS`](https://www.elastic.co/guide/en/ecs/current/ecs-tls.html)
* [`User`](https://www.elastic.co/guide/en/ecs/current/ecs-user.html)
* [`Vulnerability`](https://www.elastic.co/guide/en/ecs/current/ecs-vulnerability.html)
* Please note that some of the above-mentioned namespaces are already a part of the Semantic Conventions schema. The goal is to expand these namespaces to include additional fields that are relevant to security use cases.

* As new use cases and namespaces are introduced to the semantic conventions, there may be a need for additional instrumentation to accommodate them. It is anticipated that this aspect will expand through an iterative process.

## Staffing / Help Wanted

We are seeking security experts to collaborate with us in expanding the security domain within the community.

### Required staffing

There is an open [PR](https://github.com/open-telemetry/semantic-conventions/issues/580) to create a `semconv-security-approver` group for all PRs related to security fields.

* project lead: @trisch-me (Elastic)
* domain expert: @mjwolf (Elastic)
* domain expert: @raesene (Datadog)
* domain expert: @lambdanis (Isovalent)
* domain expert: @mdelfabro (Dynatrace)
* domain expert: @kelnage (Grafana Labs)
* domain expert: @alexvanboxel (Collibra)

* TC sponsor: @reyang
* TC sponsor: @jsuereth

Need more
- [ ] domain experts
- [ ] potentially, maintainers of language-specific instrumentation may be needed if the need arises.


## Meeting Times

There is an allocated time in the Semantic Conventions SIG for this project.
- Mondays at 8 AM PST

For async conversation please use #otel-semconv-security slack channel from official CNCF slack workspace.

## Timeline

The goal is to have the security semantic conventions implemented by the end of 2024.

The timeline for this project is as follows:
December 2023: Initial Draft
April 2024: Review and Refinement
May 2024-December 2024: Introducing the Security Semantic Conventions


## Labels

* security

## Linked Issues and PRs

* [Donating ECS to OpenTelemetry](https://github.com/open-telemetry/oteps/blob/main/text/0199-support-elastic-common-schema-in-opentelemetry.md)
* [Creation of semconv-security-approver group](https://github.com/open-telemetry/semantic-conventions/issues/580)
40 changes: 0 additions & 40 deletions working-groups/end-user/README.md

This file was deleted.

27 changes: 0 additions & 27 deletions working-groups/end-user/discussion-group-code-of-conduct.md

This file was deleted.

Loading

0 comments on commit ae1abe5

Please sign in to comment.