From 312b08f45a27ec738bc76af3064941bb1c683b77 Mon Sep 17 00:00:00 2001 From: Inaki Fernandez Date: Wed, 6 May 2020 13:04:57 +0200 Subject: [PATCH] table update --- docs/aws.md | 4 ++-- docs/monitoring.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/aws.md b/docs/aws.md index 243ec2d3..1866e896 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -313,13 +313,13 @@ - [ec2-ssh-yplan: A pair of command line utilities for finding and SSH-ing into your Amazon EC2 instances by tag (such as ‘Name’)](https://pypi.python.org/pypi/ec2-ssh-yplan/) - List running instances using 'awscli': -``` +```bash aws ec2 describe-instances --filters Name=instance-state-name,Values=running --query 'Reservations[].Instances[].[InstanceID]' ``` - List all AWS instances in a table format using 'awscli': -``` +```bash aws ec2 describe-instances --query 'Reservations[].Instances[].[Placement.AvailabilityZone, State.Name, InstanceID,InstanceType,Platform,Tags.Value,State.Code,Tags.Values]' --output table ``` diff --git a/docs/monitoring.md b/docs/monitoring.md index 10421af5..b2ee4535 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -46,7 +46,7 @@ OpenShift Container Platform Monitoring ships with a Prometheus instance for clu | Fluentd | 0.12 | [OpenShift 3.11 Metrics & Logging](https://docs.openshift.com/container-platform/3.11/release_notes/ocp_3_11_release_notes.html#ocp-311-metrics-and-logging) | | Kibana | 5.6.13 | [kibana 5.6.13](https://www.elastic.co/guide/en/kibana/5.6/introduction.html) | | Prometheus | 2.3.2 | [OpenShift 3.11 Prometheus Cluster Monitoring](https://docs.openshift.com/container-platform/3.11/install_config/prometheus_cluster_monitoring.html#prometheus-cluster-monitoring) | -| Prometheus Operator | (Prometheus 2.3.2 ) | [Prometheus Operator technical preview](https://www.redhat.com/en/blog/generally-available-today-red-hat-openshift-container-platform-311-ready-power-enterprise-kubernetes-deployments) | +| Prometheus Operator | | [Prometheus Operator technical preview](https://www.redhat.com/en/blog/generally-available-today-red-hat-openshift-container-platform-311-ready-power-enterprise-kubernetes-deployments) | | Prometheus Alert Manager | 0.15.1 1 | [OpenShift 3.11 Configuring Prometheus Alert Manager](https://docs.openshift.com/container-platform/3.11/install_config/prometheus_cluster_monitoring.html#configuring-alertmanager_prometheus-cluster-monitoring) | | Grafana | 5.2.3 | [OpenShift 3.11 Prometheus Cluster Monitoring](https://docs.openshift.com/container-platform/3.11/install_config/prometheus_cluster_monitoring.html#prometheus-cluster-monitoring) |