Skip to content

Commit 869732c

Browse files
committed
Merge branch 'main' into ruby33
2 parents 54df03d + 1ce65a0 commit 869732c

File tree

94 files changed

+224
-117
lines changed

Some content is hidden

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

94 files changed

+224
-117
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ jobs:
8080
- name: Build Python Package
8181
working-directory: openc3/python
8282
run: python -m build
83+
- name: Build Yarn Packages
84+
run: yarn; yarn build:common
85+
working-directory: openc3-cosmos-init/plugins
8386
- name: build_multi_arch
8487
# This `shell` line is required to get around a known issue: https://github.com/actions/runner/issues/241#issuecomment-745902718
8588
shell: 'script -q -e -c "bash {0}"'

docs.openc3.com/docs/configuration/plugins.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,15 @@ Example Usage:
755755
SHARD 0
756756
```
757757

758+
### STOPPED
759+
<div class="right">(Since 6.2.0)</div>**Initially creates the microservice in a stopped state (not enabled)**
760+
761+
762+
Example Usage:
763+
```ruby
764+
STOPPED
765+
```
766+
758767
## TOOL
759768
**Define a tool**
760769

docs.openc3.com/docs/guides/monitoring.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ sidebar_custom_props:
77

88
### Monitoring and observability
99

10+
:::warning Example Only
11+
Monitoring with Fluentd is not officially supported by OpenC3 and the documentation here is simply an example of how this could be performed.
12+
:::
13+
1014
With moving COSMOS to container based service, we needed a better way to monitor the internals of COSMOS. So here is some information on external services that you can use to monitor COSMOS. If you want to read more about [Monitoring Distributed Systems](https://sre.google/sre-book/monitoring-distributed-systems/)
1115

1216
### [Fluent/Fluentd](https://www.fluentd.org/guides/recipes/docker-logging)
@@ -81,13 +85,15 @@ in_docker.conf
8185

8286
Dockerfile
8387

88+
NOTE: If building on a Macbook (for example) you should use the architecture specific build in the FROM line, e.g. `FROM arm64v8/fluentd:v1.18-1`
89+
8490
```
85-
FROM fluent/fluentd:v1.10.3-1.0
91+
FROM fluent/fluentd:v1.18-1
8692
8793
COPY ./in_docker.conf /fluentd/etc/fluent.conf
8894
USER root
89-
RUN gem install fluent-plugin-elasticsearch --no-document --version 4.0.7 \
90-
&& gem install fluent-plugin-prometheus --no-document --version 1.8.5
95+
RUN gem install fluent-plugin-elasticsearch --no-document --version 5.4.3 \
96+
&& gem install fluent-plugin-prometheus --no-document --version 2.2.0
9197
USER fluent
9298
```
9399

@@ -156,7 +162,7 @@ scrape_configs:
156162
Dockerfile
157163

158164
```
159-
FROM prom/prometheus:v2.24.1
165+
FROM prom/prometheus:v3.2.1
160166
ADD prometheus.yaml /etc/prometheus/
161167
```
162168

docs/404.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/assets/js/019369f3.cdc4c7af.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/assets/js/019369f3.dff0c62b.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/6831b732.c6eb83e6.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/6831b732.e6e94dcd.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)