Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit 80171ae

Browse files
committed
prepare contributing for release, update sample
1 parent 614d4ce commit 80171ae

File tree

2 files changed

+51
-31
lines changed

2 files changed

+51
-31
lines changed

CONTRIBUTING.md

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
1-
---
2-
3-
---
4-
5-
# Source Code Submissions
6-
We welcome your contributions and look forward to collaborating with you. We can only accept source code repository
7-
submissions from users who have signed and returned the Oracle
8-
Contributor Agreement. You will find details and the agreement to sign at this OTN web page:
9-
[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html).
10-
11-
# Other Contributions
12-
For all project Submissions other than source code repository contributions, the following also applies: Oracle does
13-
not claim ownership of Your Submissions. However, in order to fulfill
14-
the purposes of this project, You must give Oracle and all Users
15-
the right to post, access, discuss, use, publish, disseminate, and refine
16-
Your Submissions.
17-
18-
In legalese: *You hereby grant to Oracle and all
19-
Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive,
20-
and fully sub-licensable right and license, under Your intellectual
21-
property rights, to reproduce, modify, adapt, publish, translate, create
22-
derivative works from, distribute, perform, display, and use Your
23-
Submissions (in whole or part) and to incorporate or implement them in
24-
other works in any form, media, or technology now known or later
25-
developed, all subject to the obligation to retain any copyright notices
26-
included in Your Submissions. All Users, Oracle, and their
27-
sublicensees are responsible for any modifications they make to the
28-
Submissions of others.*
29-
30-
Copyright © 2017 Oracle and/or its affiliates. All rights reserved.
1+
# Contributing
2+
3+
Oracle welcomes contributions to this repository from anyone.
4+
5+
If you want to submit a pull request to fix a bug or enhance an existing
6+
feature, please first open an issue and link to that issue when you
7+
submit your pull request.
8+
9+
If you have any questions about a possible submission, feel free to open
10+
an issue too.
11+
12+
## Contributing to the Oracle WebLogic Server Kubernetes Operator repository
13+
14+
Pull requests can be made under
15+
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
16+
17+
For pull requests to be accepted, the bottom of your commit message must have
18+
the following line using your name and e-mail address as it appears in the
19+
OCA Signatories list.
20+
21+
```
22+
Signed-off-by: Your Name <you@example.org>
23+
```
24+
25+
This can be automatically added to pull requests by committing with:
26+
27+
```
28+
git commit --signoff
29+
```
30+
31+
Only pull requests from committers that can be verified as having
32+
signed the OCA can be accepted.
33+
34+
### Pull request process
35+
36+
1. Fork this repository
37+
1. Create a branch in your fork to implement the changes. We recommend using
38+
the issue number as part of your branch name, e.g. `1234-fixes`
39+
1. Ensure that any documentation is updated with the changes that are required
40+
by your fix.
41+
1. Ensure that any samples are updated if the base image has been changed.
42+
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
43+
what your changes are meant to do and provide simple steps on how to validate
44+
your changes. Ensure that you reference the issue you created as well.
45+
We will assign the pull request to 2-3 people for review before it is merged.

samples/weblogicLoggingExporter.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018 Oracle and/or its affiliates
2+
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
55
*/
@@ -22,6 +22,11 @@ ElasticSearchHost: localhost
2222
# The port that Elastic Search is listening to. Default to 9200
2323
ElasticSearchPort: 9200
2424

25+
# The "domainUID" used to uniquely identify this domain. This is used to filter logs in Kibana by the domain they came
26+
# from. You should use a unique value for each domain. If you are using the WebLogic Kubernetes Operator, it is
27+
# strongly recommended you use the same value as in the domain custom resource.
28+
domainUid: domain1
29+
2530
# Decide if this exporter should be enabled. Default is true. If set to false, nothing will be logged to Elastic Search.
2631
weblogicLoggingExporterEnabled: true
2732

0 commit comments

Comments
 (0)