cortexapps-cli 1.0.3__tar.gz → 1.0.4__tar.gz

{cortexapps_cli-1.0.3 → cortexapps_cli-1.0.4}/LICENSE

@@ -1,6 +1,4 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 tsuyoshiwada
+Copyright (c) 2018 The Python Packaging Authority
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +7,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{cortexapps_cli-1.0.3 → cortexapps_cli-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cortexapps-cli
-Version: 1.0.3
+Version: 1.0.4
 Summary: Command Line Interface for cortexapps
 License: MIT
 Author: Cortex Apps
@@ -464,6 +464,20 @@ This recipe does the following:
        cortex catalog descriptor -y -t ${entity} | yq "with(.info.x-cortex-owners[]; select(.type | downcase == \"group\") | select(.provider == null) | .provider = \"${provider}\" )" | cortex catalog create -f-
     done
 
+-----------------------------------------------------------------------------
+Export all workflows
+-----------------------------------------------------------------------------
+
+This recipe creates YAML files for each Workflow.  This may be helpful if you are considering enabling GitOps for Workflows and you want to export current Workflows as a starting point.
+
+.. code:: bash
+
+    for workflow in `cortex workflows list --csv --no-headers --columns tag`
+    do
+       echo "workflow = $workflow"
+       cortex workflows get --tag $workflow --yaml > $workflow.yaml
+    done
+
 -----------------------------------------------------------------------------
 Obfuscating a Cortex export
 -----------------------------------------------------------------------------

{cortexapps_cli-1.0.3 → cortexapps_cli-1.0.4}/README.rst

@@ -439,6 +439,20 @@ This recipe does the following:
        cortex catalog descriptor -y -t ${entity} | yq "with(.info.x-cortex-owners[]; select(.type | downcase == \"group\") | select(.provider == null) | .provider = \"${provider}\" )" | cortex catalog create -f-
     done
 
+-----------------------------------------------------------------------------
+Export all workflows
+-----------------------------------------------------------------------------
+
+This recipe creates YAML files for each Workflow.  This may be helpful if you are considering enabling GitOps for Workflows and you want to export current Workflows as a starting point.
+
+.. code:: bash
+
+    for workflow in `cortex workflows list --csv --no-headers --columns tag`
+    do
+       echo "workflow = $workflow"
+       cortex workflows get --tag $workflow --yaml > $workflow.yaml
+    done
+
 -----------------------------------------------------------------------------
 Obfuscating a Cortex export
 -----------------------------------------------------------------------------

{cortexapps_cli-1.0.3 → cortexapps_cli-1.0.4}/cortexapps_cli/commands/integrations_commands/prometheus.py

@@ -8,9 +8,11 @@ app = typer.Typer(help="Prometheus commands", no_args_is_help=True)
 @app.command()
 def add(
     ctx: typer.Context,
-    alias: str = typer.Option(..., "--alias", "-a", help="Alias for this configuration"),
-    api_key: str = typer.Option(..., "--api-key", "-api", help="API key"),
+    alias: str = typer.Option(None,  "--alias", "-a", help="Alias for this configuration"),
     host: str = typer.Option(None, "--host", "-h", help="Optional host name"),
+    username: str = typer.Option(None, "--username", "-u", help="username"),
+    password: str = typer.Option(None, "--password", "-p", help="password"),
+    tenant_id: str = typer.Option(None, "--tenant", "-t", help="Optional tenant id"),
     is_default: bool = typer.Option(False, "--is-default", "-i", help="If this is the default configuration"),
     file_input: Annotated[typer.FileText, typer.Option("--file", "-f", help="JSON file containing configurations, if command line options not used; can be passed as stdin with -, example: -f-")] = None,
 ):
@@ -21,19 +23,23 @@ def add(
     client = ctx.obj["client"]
 
     if file_input:
-        if alias or api_key or is_default or host:
-            raise typer.BadParameter("When providing a custom event definition file, do not specify any other custom event attributes")
+        if alias or host or username or password or tenant_id or is_default:
+            raise typer.BadParameter("When providing a prometheus definition file, do not specify any other attributes")
         data = json.loads("".join([line for line in file_input]))
     else:
+        
         data = {
            "alias": alias,
-           "apiKey": api_key,
            "host": host,
-           "isDefault": is_default,
+           "username": username,
+           "password": password,
+           "tenant_id": tenant_id,
+           "is_default": is_default
         }       
 
-        # remove any data elements that are None - can only be is_default
-        data = {k: v for k, v in data.items() if v is not None}
+        for k, v in data.items():
+            if v is None:
+                raise typer.BadParameter("Missing required parameter: " + k)
     
     r = client.post("api/v1/prometheus/configuration", data=data)
     print_json(data=r)
@@ -51,7 +57,7 @@ def add_multiple(
 
     data = json.loads("".join([line for line in file_input]))
 
-    r = client.put("api/v1/aws/configurations", data=data)
+    r = client.put("api/v1/prometheus/configurations", data=data)
     print_json(data=r)
 
 @app.command()

{cortexapps_cli-1.0.3 → cortexapps_cli-1.0.4}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "cortexapps-cli"
 # version will be incremented via command line as part of github actions build
-version = "1.0.3"
+version = "1.0.4"
 description = "Command Line Interface for cortexapps"
 license = "MIT"
 authors = [