resolved merge conflicts

pull/963/head
Scott Anderson 2020-04-22 11:26:27 -06:00
commit a63d9c37df
3 changed files with 2 additions and 51 deletions

View File

@ -39,24 +39,10 @@ Use the InfluxDB UI or `influx` CLI to view your organization ID.
### Organization ID in the UI ### Organization ID in the UI
After logging in to the InfluxDB UI, your organization ID appears in the URL. After logging in to the InfluxDB UI, your organization ID appears in the URL.
{{< code-tabs-wrapper >}}
{{% code-tabs %}}
[InfluxDB Cloud](#)
[InfluxDB OSS](#)
{{% /code-tabs %}}
{{< code-tab-content >}}
<pre class="highlight">
https://us-west-2-1.aws.cloud2.influxdata.com/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/...
</pre>
{{< /code-tab-content >}}
{{< code-tab-content >}}
<pre class="highlight"> <pre class="highlight">
http://localhost:9999/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/... http://localhost:9999/orgs/<span class="bp" style="font-weight:bold;margin:0 .15rem">03a2bbf46249a000</span>/...
</pre> </pre>
{{< /code-tab-content >}}
{{< /code-tabs-wrapper >}}
_For specific InfluxDB Cloud provider and region URLs, see [InfluxDB Cloud URLs](/v2.0/cloud/urls/)._
### Organization ID in the CLI ### Organization ID in the CLI

View File

@ -15,27 +15,11 @@ Access the InfluxDB API using the `/api/v2/` endpoint.
InfluxDB uses [authentication tokens](/v2.0/security/tokens/) to authorize API requests. InfluxDB uses [authentication tokens](/v2.0/security/tokens/) to authorize API requests.
Include your authentication token as an `Authorization` header in each request. Include your authentication token as an `Authorization` header in each request.
{{< code-tabs-wrapper >}}
{{% code-tabs %}}
[InfluxDB OSS](#)
[InfluxDB Cloud](#)
{{% /code-tabs %}}
{{% code-tab-content %}}
```sh ```sh
curl --request POST \ curl --request POST \
--url http://localhost:9999/api/v2/write?org=my-org&bucket=example-bucket \ --url http://localhost:9999/api/v2/write?org=my-org&bucket=example-bucket \
--header 'Authorization: Token YOURAUTHTOKEN' --header 'Authorization: Token YOURAUTHTOKEN'
``` ```
{{% /code-tab-content %}}
{{% code-tab-content %}}
```sh
# Use the hostname of your InfluxDB Cloud UI
curl --request POST \
--url https://us-west-2-1.aws.cloud2.influxdata.com/api/v2/write?org=my-org&bucket=example-bucket \
--header 'Authorization: Token YOURAUTHTOKEN'
```
{{% /code-tab-content %}}
{{< /code-tabs-wrapper >}}
## View InfluxDB v2 API Documentation ## View InfluxDB v2 API Documentation
<a class="btn" href="/v2.0/api/">InfluxDB v2.0 API documentation</a> <a class="btn" href="/v2.0/api/">InfluxDB v2.0 API documentation</a>

View File

@ -197,31 +197,12 @@ Include the following in your request:
Below is an example API write request using `curl`. Below is an example API write request using `curl`.
The URL depends on the version and location of your InfluxDB 2.0 instance. The URL depends on the version and location of your InfluxDB 2.0 instance.
{{< tabs-wrapper >}}
{{% tabs %}}
[InfluxDB OSS](#)
[{{< cloud-name "short">}}](#)
{{% /tabs %}}
{{% tab-content %}}
```sh ```sh
curl -XPOST "http://localhost:9999/api/v2/write?org=YOUR_ORG&bucket=YOUR_BUCKET&precision=s" \ curl -XPOST "http://localhost:9999/api/v2/write?org=YOUR_ORG&bucket=YOUR_BUCKET&precision=s" \
--header "Authorization: Token YOURAUTHTOKEN" \ --header "Authorization: Token YOURAUTHTOKEN" \
--data-raw "mem,host=host1 used_percent=23.43234543 1556896326" --data-raw "mem,host=host1 used_percent=23.43234543 1556896326"
``` ```
{{% /tab-content %}}
{{% tab-content %}}
{{% cloud %}}
For the specific URL of your {{< cloud-name "short" >}} instance, see [InfluxDB Cloud URLs](/v2.0/cloud/urls/).
{{% /cloud %}}
```sh
curl -XPOST "YOUR-INFLUXDB-CLOUD-URL/api/v2/write?org=YOUR_ORG&bucket=YOUR_BUCKET&precision=s" \
--header "Authorization: Token YOURAUTHTOKEN" \
--data-raw "mem,host=host1 used_percent=23.43234543 1556896326"
```
{{% /tab-content %}}
{{< /tabs-wrapper >}}
### Others ### Others